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
This commit is contained in:
James E. Blair 2019-10-04 14:11:26 -07:00
parent 1641477c95
commit d579b997c4
1 changed files with 2 additions and 0 deletions

View File

@ -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'),