Plumb through storyboard hiera data

NOTE: We should update storyboard-dev to be driven by
letsencrypt first, otherwise we need to plumb in the
self-signed cert, which gets weird with needing to
import it for java which in this case is in the container
image, meaning we either need to bind-mount java certs in
or build it in to the image.

Change-Id: Ida9dd15ca8262925c54579660fe9c16e2b573907
This commit is contained in:
Monty Taylor 2019-10-29 10:27:33 +09:00
parent cc65640ef4
commit e42862af73
6 changed files with 9 additions and 3 deletions

View File

@ -0,0 +1 @@
gerrit_storyboard_url: https://storyboard-dev.openstack.org

View File

@ -70,3 +70,4 @@ gerrit_replication:
replicationDelay: '1'
threads: '4'
mirror: true
gerrit_storyboard_url: https://storyboard.openstack.org

View File

@ -66,11 +66,11 @@
html = ""
[commentlink "story"]
match = "\\b[Ss]tory:? #?(\\d+)"
link = "https://storyboard.openstack.org/#!/story/$1"
link = "{{ gerrit_storyboard_url }}/#!/story/$1"
html = ""
[commentlink "task"]
match = "\\b[Tt]ask:? #?(\\d+)"
link = "https://storyboard.openstack.org/#!/task/$1"
link = "{{ gerrit_storyboard_url }}/#!/task/$1"
html = ""
[commentlink "its-storyboard"]
match = "\\b[Tt]ask:? #?(\\d+)"
@ -101,7 +101,8 @@
link = ""
html = "$1<a href=\"/#/q/$2\">$2</a>$3"
[its-storyboard]
url = https://storyboard.openstack.org
url = {{ gerrit_storyboard_url }}
password = {{ gerrit_storyboard_token }}
[trackingid "launchpad-bug"]
match = "\\#?(\\d+)"
footer = "closes-bug:"

View File

@ -10,3 +10,4 @@
gerrit_lp_access_token: "{{ gerrit_dev_lp_access_token }}"
gerrit_lp_access_secret: "{{ gerrit_dev_lp_access_secret }}"
gerrit_lp_consumer_key: "{{ gerrit_dev_lp_consumer_key }}"
gerrit_storyboard_token: "{{ gerrit_dev_storyboard_token }}"

View File

@ -32,3 +32,4 @@ gerrit_dev_database_config_section: |
type = h2
database = tmp/ReviewDB
gerrit_run_init: true
gerrit_dev_storyboard_token: 4020000c-d1b9-4173-ab33-2f55dbc1c718

View File

@ -32,3 +32,4 @@ gerrit_database_config_section: |
type = h2
database = tmp/ReviewDB
gerrit_run_init: true
gerrit_storyboard_token: 52514e74-4b8f-4d6d-a29a-a6262f97578a