Merge "Add support for additional launcher config options"

manifests/init.pp

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

templates/zuul.conf.erb

@@ -62,6 +62,12 @@ default_to=<%= @smtp_default_to %>
 [launcher]
 jenkins_jobs=<%= @jenkins_jobs %>
 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 -%>
 
 <% @sites.each do |site| -%>