opendev/puppet-zuul
Code Issues Proposed changes

Move statsd to correct zuul.conf file

Browse Source 
This was added to zuulv3, not zuulv2.

Change-Id: Ieb36a6122f9b4c30d547326e7fcd8377857e7d78
This commit is contained in:
James E. Blair 2017-10-15 15:17:17 -07:00
parent 42065b22ee
commit 22b49ea1e5
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
templates/zuul.conf.erb
View File

@ -6,11 +6,6 @@ check_job_registration=<%= @gearman_check_job_registration %>
start=<%= @internal_gearman %> start=<%= @internal_gearman %>
log_config=/etc/zuul/gearman-logging.conf log_config=/etc/zuul/gearman-logging.conf
<% if @statsd_host != "" %>
[statsd]
server=<%= @statsd_host %>
<% end %>
<% if @gerrit_server != "" -%> <% if @gerrit_server != "" -%>
[gerrit] [gerrit]
server=<%= @gerrit_server %> server=<%= @gerrit_server %>

5
templates/zuulv3.conf.erb
View File

@ -38,6 +38,11 @@ hosts=<%= @zookeeper_hosts %>
session_timeout=<%= @zookeeper_session_timeout %> session_timeout=<%= @zookeeper_session_timeout %>
<% end -%> <% end -%>
<% if @statsd_host != "" %>
[statsd]
server=<%= @statsd_host %>
<% end %>
[merger] [merger]
git_dir=/var/lib/zuul/git git_dir=/var/lib/zuul/git
zuul_url=<%= @zuul_url %> zuul_url=<%= @zuul_url %>