diff --git a/templates/zuul.conf.erb b/templates/zuul.conf.erb index 25a1ef8..a59c011 100644 --- a/templates/zuul.conf.erb +++ b/templates/zuul.conf.erb @@ -6,11 +6,6 @@ check_job_registration=<%= @gearman_check_job_registration %> start=<%= @internal_gearman %> log_config=/etc/zuul/gearman-logging.conf -<% if @statsd_host != "" %> -[statsd] -server=<%= @statsd_host %> -<% end %> - <% if @gerrit_server != "" -%> [gerrit] server=<%= @gerrit_server %> diff --git a/templates/zuulv3.conf.erb b/templates/zuulv3.conf.erb index 72d1b91..4514fe6 100644 --- a/templates/zuulv3.conf.erb +++ b/templates/zuulv3.conf.erb @@ -38,6 +38,11 @@ hosts=<%= @zookeeper_hosts %> session_timeout=<%= @zookeeper_session_timeout %> <% end -%> +<% if @statsd_host != "" %> +[statsd] +server=<%= @statsd_host %> +<% end %> + [merger] git_dir=/var/lib/zuul/git zuul_url=<%= @zuul_url %>