From e42862af7393eeff530569318b0b1262c2a9808b Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Tue, 29 Oct 2019 10:27:33 +0900 Subject: [PATCH] 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 --- playbooks/host_vars/review-dev01.openstack.org.yaml | 1 + playbooks/host_vars/review01.opendev.org.yaml | 1 + playbooks/roles/gerrit/templates/gerrit.config | 7 ++++--- playbooks/service-review-dev.yaml | 1 + playbooks/zuul/templates/group_vars/review-dev.yaml.j2 | 1 + playbooks/zuul/templates/group_vars/review.yaml.j2 | 1 + 6 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 playbooks/host_vars/review-dev01.openstack.org.yaml diff --git a/playbooks/host_vars/review-dev01.openstack.org.yaml b/playbooks/host_vars/review-dev01.openstack.org.yaml new file mode 100644 index 0000000000..0ee38440ed --- /dev/null +++ b/playbooks/host_vars/review-dev01.openstack.org.yaml @@ -0,0 +1 @@ +gerrit_storyboard_url: https://storyboard-dev.openstack.org diff --git a/playbooks/host_vars/review01.opendev.org.yaml b/playbooks/host_vars/review01.opendev.org.yaml index c469d29f69..5475f8386c 100644 --- a/playbooks/host_vars/review01.opendev.org.yaml +++ b/playbooks/host_vars/review01.opendev.org.yaml @@ -70,3 +70,4 @@ gerrit_replication: replicationDelay: '1' threads: '4' mirror: true +gerrit_storyboard_url: https://storyboard.openstack.org diff --git a/playbooks/roles/gerrit/templates/gerrit.config b/playbooks/roles/gerrit/templates/gerrit.config index 5f6c82f2d7..51a51c205f 100644 --- a/playbooks/roles/gerrit/templates/gerrit.config +++ b/playbooks/roles/gerrit/templates/gerrit.config @@ -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$2$3" [its-storyboard] - url = https://storyboard.openstack.org + url = {{ gerrit_storyboard_url }} + password = {{ gerrit_storyboard_token }} [trackingid "launchpad-bug"] match = "\\#?(\\d+)" footer = "closes-bug:" diff --git a/playbooks/service-review-dev.yaml b/playbooks/service-review-dev.yaml index e4a650a6c7..cfc0d26c29 100644 --- a/playbooks/service-review-dev.yaml +++ b/playbooks/service-review-dev.yaml @@ -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 }}" diff --git a/playbooks/zuul/templates/group_vars/review-dev.yaml.j2 b/playbooks/zuul/templates/group_vars/review-dev.yaml.j2 index 4b9a212adf..bcfc03ffc3 100644 --- a/playbooks/zuul/templates/group_vars/review-dev.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/review-dev.yaml.j2 @@ -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 diff --git a/playbooks/zuul/templates/group_vars/review.yaml.j2 b/playbooks/zuul/templates/group_vars/review.yaml.j2 index ea27cb94c1..029e8af96c 100644 --- a/playbooks/zuul/templates/group_vars/review.yaml.j2 +++ b/playbooks/zuul/templates/group_vars/review.yaml.j2 @@ -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