From 22b49ea1e52d152c9b1e534e3c7ce309d92d55dc Mon Sep 17 00:00:00 2001
From: "James E. Blair" <jeblair@redhat.com>
Date: Sun, 15 Oct 2017 15:17:17 -0700
Subject: [PATCH] Move statsd to correct zuul.conf file

This was added to zuulv3, not zuulv2.

Change-Id: Ieb36a6122f9b4c30d547326e7fcd8377857e7d78
---
 templates/zuul.conf.erb   | 5 -----
 templates/zuulv3.conf.erb | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

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 %>