From bbf58f57234683ca5a63c878bb483f676e6f2ce9 Mon Sep 17 00:00:00 2001
From: Alexis Deberg <alexis.deberg@ubisoft.com>
Date: Thu, 6 Feb 2020 10:13:26 -0500
Subject: [PATCH] Swift: remove meta field from rsync command

Remove the {meta} from the default settings in the account, container
and object services templates.

Change-Id: I079fddf8feb020bed93bf44b8aaec0882823e15c
Closes-Bug: #1862058
---
 ansible/roles/swift/templates/account.conf.j2              | 2 +-
 ansible/roles/swift/templates/container.conf.j2            | 2 +-
 ansible/roles/swift/templates/object.conf.j2               | 2 +-
 ...ange-defaut-rsync-module-template-7c891efbe79a96a9.yaml | 7 +++++++
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 releasenotes/notes/change-defaut-rsync-module-template-7c891efbe79a96a9.yaml

diff --git a/ansible/roles/swift/templates/account.conf.j2 b/ansible/roles/swift/templates/account.conf.j2
index e546df988a..3ec7d4371b 100644
--- a/ansible/roles/swift/templates/account.conf.j2
+++ b/ansible/roles/swift/templates/account.conf.j2
@@ -32,7 +32,7 @@ replication_server = {{ service_name == 'swift-account-replication-server' }}
 
 {% if service_name == 'swift-account-replicator' %}
 [account-replicator]
-rsync_module = {replication_ip}:{meta}:account
+rsync_module = {replication_ip}::account
 {% endif %}
 
 {% if service_name == 'swift-account-reaper' %}
diff --git a/ansible/roles/swift/templates/container.conf.j2 b/ansible/roles/swift/templates/container.conf.j2
index 97ff93ed1a..f0761c09f4 100644
--- a/ansible/roles/swift/templates/container.conf.j2
+++ b/ansible/roles/swift/templates/container.conf.j2
@@ -33,7 +33,7 @@ replication_server = {{ service_name == 'swift-container-replication-server' }}
 
 {% if service_name == 'swift-container-replicator' %}
 [container-replicator]
-rsync_module = {replication_ip}:{meta}:container
+rsync_module = {replication_ip}::container
 {% endif %}
 
 {% if service_name == 'swift-container-updater' %}
diff --git a/ansible/roles/swift/templates/object.conf.j2 b/ansible/roles/swift/templates/object.conf.j2
index bc62f9a51e..ff889ebe26 100644
--- a/ansible/roles/swift/templates/object.conf.j2
+++ b/ansible/roles/swift/templates/object.conf.j2
@@ -37,7 +37,7 @@ replication_server = {{ service_name == 'swift-object-replication-server' }}
 
 [object-replicator]
 {% if service_name == 'swift-object-replicator' %}
-rsync_module = {replication_ip}:{meta}:object
+rsync_module = {replication_ip}::object
 {% endif %}
 
 {% if service_name == 'swift-object-updater' %}
diff --git a/releasenotes/notes/change-defaut-rsync-module-template-7c891efbe79a96a9.yaml b/releasenotes/notes/change-defaut-rsync-module-template-7c891efbe79a96a9.yaml
new file mode 100644
index 0000000000..0b334c9cbd
--- /dev/null
+++ b/releasenotes/notes/change-defaut-rsync-module-template-7c891efbe79a96a9.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Remove the meta field of the Swift rings from the default rsync_module
+    template. Having it by default, undocumented, can lead to
+    unexpected behavior when the Swift documentation states that this field
+    is not processed.