opendev/system-config
Code Issues Proposed changes

Set zuul openstack tenant name explicitly

Browse Source 
Rather than encoding the tenant we're whitelabeling in the zuul_web_url,
pass it as zuul_tenant_name so that the URL for github webhooks works
properly.

Depends-On: https://review.openstack.org/545137
Change-Id: I0390309a8ec7de5bea8c5e87acf49c1b87d36417
This commit is contained in:
Monty Taylor 2018-02-15 16:03:05 -06:00
parent e3043006a0
commit 436eefe4aa
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/site.pp
View File

@ -1303,7 +1303,8 @@ node /^zuul\d+\.openstack\.org$/ {
connection_secrets => hiera('zuul_connection_secrets', []),
vhost_name => 'zuul.openstack.org',
zuul_status_url => 'http://127.0.0.1:8001/openstack',
zuul_web_url => 'http://127.0.0.1:9000/openstack',
zuul_web_url => 'http://127.0.0.1:9000',
zuul_tenant_name => 'openstack',
gearman_client_ssl_cert => hiera('gearman_client_ssl_cert'),
gearman_client_ssl_key => hiera('gearman_client_ssl_key'),
gearman_server_ssl_cert => hiera('gearman_server_ssl_cert'),