From f04028300004f75b6d996f3ae4ddb3704a778fe0 Mon Sep 17 00:00:00 2001
From: James McCarthy <james.m.mccarthy@oracle.com>
Date: Fri, 28 Oct 2016 16:38:01 +0100
Subject: [PATCH] Adjust object-replicator heading within object.conf.j2
 template.

The swift-object-auditor logs many complaints of missing
object-replicator configuration, as this section is undefined.

Move the header outside of the == 'swift-object-replicator' check,
so other services will get an empty section to stop complaints.

TrivialFix
Closes-Bug: #1637561
Change-Id: I9c8d960b0c31e448afdeaac5f3d38e1be5ff965d
(cherry picked from commit 790c6b2a9fb007a0b3fa847a4617baf9a4b16298)
---
 ansible/roles/swift/templates/object.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/swift/templates/object.conf.j2 b/ansible/roles/swift/templates/object.conf.j2
index ae4f08fd57..bd8b25fa92 100644
--- a/ansible/roles/swift/templates/object.conf.j2
+++ b/ansible/roles/swift/templates/object.conf.j2
@@ -23,8 +23,8 @@ use = egg:swift#object
 [object-auditor]
 {% endif %}
 
-{% if service_name == 'swift-object-replicator' %}
 [object-replicator]
+{% if service_name == 'swift-object-replicator' %}
 sync_module = {replication_ip}:{meta}:object
 {% endif %}