opendev
/
puppet-zuul
Code Issues Proposed changes

Merge "Add support for mapping dirs into bubblewrap"

This commit is contained in:
Jenkins 2017-06-27 23:06:39 +00:00 committed by Gerrit Code Review
parent 220481fab4 d7a484b188
commit daa1e5bd12
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/init.pp
View File

@ -67,6 +67,10 @@ class zuul (
$sites = [],
$nodes = [],
$connections = [],
$trusted_ro_dirs = [],
$trusted_rw_dirs = [],
$untrusted_ro_dirs = [],
$untrusted_rw_dirs = [],
$python_version = 2,
$zuulv3 = false,
$gearman_client_ssl_cert = undef,

4
templates/zuulv3.conf.erb
View File

@ -49,6 +49,10 @@ log_config=/etc/zuul/executor-logging.conf
<% if @worker_private_key_file != "" -%>
private_key_file=<%= @worker_private_key_file %>
<% end -%>
trusted_ro_dirs=<%= @trusted_ro_dirs.join(':') %>
trusted_rw_dirs=<%= @trusted_rw_dirs.join(':') %>
untrusted_ro_dirs=<%= @untrusted_ro_dirs.join(':') %>
untrusted_rw_dirs=<%= @untrusted_rw_dirs.join(':') %>
<% @connections.each do |connection| -%>
[connection "<%= connection['name'] %>"]