opendev
/
puppet-zuul
Code Issues Proposed changes

Merge "Add support for a parallel set of secrets for connections"

This commit is contained in:
Jenkins 2017-07-26 20:56:12 +00:00 committed by Gerrit Code Review
parent 04f4d9a55d afbbf2eca6
commit 267330257e
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
manifests/init.pp
View File

@ -67,6 +67,7 @@ class zuul (
$sites = [],
$nodes = [],
$connections = [],
$connection_secrets = [],
$trusted_ro_dirs = [],
$trusted_rw_dirs = [],
$untrusted_ro_dirs = [],

9
templates/zuulv3.conf.erb
View File

@ -70,5 +70,14 @@ listen_port=<%= @web_listen_port %>
<% connection.each do |key,value| -%>
<%= key %>=<%= value %>
<% end -%>
<% @connection_secrets.each do |connection_secret| -%>
<% if connection_secret['name'] == connection['name'] -%>
<% connection_secret.each do |key,value| -%>
<% if key != 'name' -%>
<%= key %>=<%= value %>
<% end -%>
<% end -%>
<% end -%>
<% end -%>
<% end -%>