openstack/kolla-ansible
Code Issues Proposed changes

Update swift templates for rsync_module

Browse Source 
With the current templates, the rsync_module is left as the default value,
which has not {meta} included. Setting sync_module has no effect.

References:
https://github.com/openstack/swift/blob/master/etc/container-server.conf-sample
https://github.com/openstack/swift/blob/master/swift/obj/replicator.py#89

Change these templates to set rsync_module instead.

Change-Id: I14773a09013b90dd2dd68110173eab1d3ccec3de
This commit is contained in:
James McCarthy 2017-11-17 17:03:54 +00:00
parent 23582ec5d7
commit 4cac847f6c
3 changed files with 3 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

@ -22,7 +22,7 @@ use = egg:swift#account
{% if service_name == 'swift-account-replicator' %}
[account-replicator]
sync_module = {replication_ip}:{meta}:account
rsync_module = {replication_ip}:{meta}:account
{% endif %}
{% if service_name == 'swift-account-reaper' %}

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

@ -23,7 +23,7 @@ allow_versions = True
{% if service_name == 'swift-container-replicator' %}
[container-replicator]
sync_module = {replication_ip}:{meta}:container
rsync_module = {replication_ip}:{meta}:container
{% endif %}
{% if service_name == 'swift-container-updater' %}

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

@ -27,7 +27,7 @@ use = egg:swift#object
[object-replicator]
{% if service_name == 'swift-object-replicator' %}
sync_module = {replication_ip}:{meta}:object
rsync_module = {replication_ip}:{meta}:object
{% endif %}
{% if service_name == 'swift-object-updater' %}