From 4cac847f6c25f05d52575b8de9f2ccc2bd4968ec Mon Sep 17 00:00:00 2001 From: James McCarthy Date: Fri, 17 Nov 2017 17:03:54 +0000 Subject: [PATCH] Update swift templates for rsync_module 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 --- ansible/roles/swift/templates/account.conf.j2 | 2 +- ansible/roles/swift/templates/container.conf.j2 | 2 +- ansible/roles/swift/templates/object.conf.j2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ansible/roles/swift/templates/account.conf.j2 b/ansible/roles/swift/templates/account.conf.j2 index 1e03fdecdc..9863eda519 100644 --- a/ansible/roles/swift/templates/account.conf.j2 +++ b/ansible/roles/swift/templates/account.conf.j2 @@ -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' %} diff --git a/ansible/roles/swift/templates/container.conf.j2 b/ansible/roles/swift/templates/container.conf.j2 index eb4ddbb66e..1cbc627524 100644 --- a/ansible/roles/swift/templates/container.conf.j2 +++ b/ansible/roles/swift/templates/container.conf.j2 @@ -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' %} diff --git a/ansible/roles/swift/templates/object.conf.j2 b/ansible/roles/swift/templates/object.conf.j2 index af18bdf2a6..d2513255df 100644 --- a/ansible/roles/swift/templates/object.conf.j2 +++ b/ansible/roles/swift/templates/object.conf.j2 @@ -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' %}