openstack/kolla-ansible
Code Issues Proposed changes

Merge "Swift: remove meta field from rsync command"

Browse Source
This commit is contained in:
Zuul 2020-02-25 15:55:03 +00:00 committed by Gerrit Code Review
commit 3b8b33a907
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/swift/templates/account.conf.j2
View File

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

2
ansible/roles/swift/templates/container.conf.j2
View File

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

2
ansible/roles/swift/templates/object.conf.j2
View File

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

7
releasenotes/notes/change-defaut-rsync-module-template-7c891efbe79a96a9.yaml Normal file
View File

@ -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.