From 436eefe4aaa95ec142797db4054c103c2cf394a1 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 15 Feb 2018 16:03:05 -0600 Subject: [PATCH] Set zuul openstack tenant name explicitly 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 --- manifests/site.pp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manifests/site.pp b/manifests/site.pp index 94a89491cd..3a4b024c6c 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -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'),