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
This commit is contained in:
Alexis Deberg 2020-02-06 10:13:26 -05:00
parent c5b4ca4f1f
commit bbf58f5723
4 changed files with 10 additions and 3 deletions

View File

@ -32,7 +32,7 @@ replication_server = {{ service_name == 'swift-account-replication-server' }}
{% if service_name == 'swift-account-replicator' %} {% if service_name == 'swift-account-replicator' %}
[account-replicator] [account-replicator]
rsync_module = {replication_ip}:{meta}:account rsync_module = {replication_ip}::account
{% endif %} {% endif %}
{% if service_name == 'swift-account-reaper' %} {% if service_name == 'swift-account-reaper' %}

View File

@ -33,7 +33,7 @@ replication_server = {{ service_name == 'swift-container-replication-server' }}
{% if service_name == 'swift-container-replicator' %} {% if service_name == 'swift-container-replicator' %}
[container-replicator] [container-replicator]
rsync_module = {replication_ip}:{meta}:container rsync_module = {replication_ip}::container
{% endif %} {% endif %}
{% if service_name == 'swift-container-updater' %} {% if service_name == 'swift-container-updater' %}

View File

@ -37,7 +37,7 @@ replication_server = {{ service_name == 'swift-object-replication-server' }}
[object-replicator] [object-replicator]
{% if service_name == 'swift-object-replicator' %} {% if service_name == 'swift-object-replicator' %}
rsync_module = {replication_ip}:{meta}:object rsync_module = {replication_ip}::object
{% endif %} {% endif %}
{% if service_name == 'swift-object-updater' %} {% if service_name == 'swift-object-updater' %}

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.