diff --git a/ansible/roles/swift/templates/account.conf.j2 b/ansible/roles/swift/templates/account.conf.j2 index e546df988a9820d4c43446163da654cbe08d75d6..3ec7d4371b4ca8283a31f2dd6a1549e02e7c613c 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 97ff93ed1a904bd980706256a4e7ad10ece386bc..f0761c09f4c86bacef303abcc313ffbd290af248 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 bc62f9a51e9bd092c64709d8a5ec9637ba5e5efc..ff889ebe2602f773539b7c99ccbca6c345c8adf8 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 0000000000000000000000000000000000000000..0b334c9cbd5032e240acace60e83c49287662af1 --- /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.