From d579b997c42f4e0fb90ebd0b46efbd5692191ad0 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Fri, 4 Oct 2019 14:11:26 -0700 Subject: [PATCH] Add zuul_connection_secrets to mergers and executors These may need secrets (such as passwords) if they need to perform git operations over http. Change-Id: I93501ae27d246c1cccfe18fc555f3f2f4b7814d5 --- manifests/site.pp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/manifests/site.pp b/manifests/site.pp index f7a3da58e6..22ac9463c9 100644 --- a/manifests/site.pp +++ b/manifests/site.pp @@ -781,6 +781,7 @@ node /^ze\d+\.open.*\.org$/ { zookeeper_hosts => 'zk01.openstack.org:2181,zk02.openstack.org:2181,zk03.openstack.org:2181', zuulv3 => true, connections => hiera('zuul_connections', []), + connection_secrets => hiera('zuul_connection_secrets', []), gearman_client_ssl_cert => hiera('gearman_client_ssl_cert'), gearman_client_ssl_key => hiera('gearman_client_ssl_key'), gearman_ssl_ca => hiera('gearman_ssl_ca'), @@ -1017,6 +1018,7 @@ node /^zm\d+.open.*\.org$/ { zookeeper_hosts => 'zk01.openstack.org:2181,zk02.openstack.org:2181,zk03.openstack.org:2181', zuulv3 => true, connections => hiera('zuul_connections', []), + connection_secrets => hiera('zuul_connection_secrets', []), gearman_client_ssl_cert => hiera('gearman_client_ssl_cert'), gearman_client_ssl_key => hiera('gearman_client_ssl_key'), gearman_ssl_ca => hiera('gearman_ssl_ca'),