opendev/puppet-zuul
Code Issues Proposed changes

Merge "Add support for additional launcher config options"

Browse Source
This commit is contained in:
Jenkins
2016-05-13 20:02:27 +00:00
committed by Gerrit Code Review
parent 611cd308dd ad5c85ec7a
commit 0acb58fa9a
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/init.pp
View File

@@ -57,6 +57,8 @@ class zuul (
# Launcher config # Launcher config
$jenkins_jobs = '', $jenkins_jobs = '',
$workspace_root = '', $workspace_root = '',
$worker_private_key_file = '',
$worker_username = '',
$sites = [], $sites = [],
) { ) {
include ::httpd include ::httpd

6
templates/zuul.conf.erb
View File

@@ -62,6 +62,12 @@ default_to=<%= @smtp_default_to %>
[launcher] [launcher]
jenkins_jobs=<%= @jenkins_jobs %> jenkins_jobs=<%= @jenkins_jobs %>
workspace_root=<%= @workspace_root %> workspace_root=<%= @workspace_root %>
<% if @worker_private_key_file != "" -%>
private_key_file=<%= @worker_private_key_file %>
<% end -%>
<% if @worker_username != "" -%>
username=<%= @worker_username %>
<% end -%>
<% end -%> <% end -%>
<% @sites.each do |site| -%> <% @sites.each do |site| -%>