diff --git a/ansible/roles/swift/templates/account.conf.j2 b/ansible/roles/swift/templates/account.conf.j2 index e0a6a522f1..79ab0099be 100644 --- a/ansible/roles/swift/templates/account.conf.j2 +++ b/ansible/roles/swift/templates/account.conf.j2 @@ -26,7 +26,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 f68464a9e7..74b45f55af 100644 --- a/ansible/roles/swift/templates/container.conf.j2 +++ b/ansible/roles/swift/templates/container.conf.j2 @@ -27,7 +27,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 63c81b0639..011f09220b 100644 --- a/ansible/roles/swift/templates/object.conf.j2 +++ b/ansible/roles/swift/templates/object.conf.j2 @@ -31,7 +31,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.