Merge "Swift: remove meta field from rsync command"

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

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

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

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.