opendev
/
puppet-zuul
Code Issues Proposed changes

Fix file path to SSL files 

The previous patch incorrect add the SSL contents to zuul.conf, we
actually want the file path.

Change-Id: If1f9e9d333d23d22a9f3e2aa320b1b5cd1642d91
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
This commit is contained in:
Paul Belanger 2017-06-16 20:34:36 -04:00
parent 1a08165eea
commit 7028052386
No known key found for this signature in database
GPG Key ID: 611A80832067AF38
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
templates/zuulv3.conf.erb
View File

@ -2,26 +2,26 @@
server=<%= @gearman_server %>
check_job_registration=<%= @gearman_check_job_registration %>
<% if @gearman_ssl_ca != nil -%>
ssl_ca=<%= gearman_ssl_ca %>
ssl_ca=/etc/zuul/ssl/ca.pem
<% end -%>
<% if @gearman_client_ssl_cert != nil -%>
ssl_cert=<%= gearman_client_ssl_cert %>
ssl_cert=/etc/zuul/ssl/client.pem
<% end -%>
<% if @gearman_client_ssl_key != nil -%>
ssl_key=<%= gearman_client_ssl_key %>
ssl_key=/etc/zuul/ssl/client.key
<% end -%>
[gearman_server]
start=<%= @internal_gearman %>
log_config=/etc/zuul/gearman-logging.conf
<% if @gearman_ssl_ca != nil -%>
ssl_ca=<%= gearman_ssl_ca %>
ssl_ca=/etc/zuul/ssl/ca.pem
<% end -%>
<% if @gearman_server_ssl_cert != nil -%>
ssl_cert=<%= gearman_server_ssl_cert %>
ssl_cert=/etc/zuul/ssl/server.pem
<% end -%>
<% if @gearman_server_ssl_key != nil -%>
ssl_key=<%= gearman_server_ssl_key %>
ssl_key=/etc/zuul/ssl/server.key
<% end -%>
[zuul]