openstack/kolla-ansible
Code Issues Proposed changes

Update swift for replication issues

Browse Source 
There are corresponding image changes to go with these ansible
changes - changes in rsyncd template, and add
environment settings for RSYNC_CONNECT_PROG (i.e. nc)

nc allows for rsync replication to easily target {{ swift_rsync_port }}

update the lock file and chroot settings in template - see bug
for more details.

Change-Id: Ic81b7de8fad8aec9416e4e27e8ffda6d03be293c
Closes-Bug: #1733851
This commit is contained in:
James McCarthy
2017-11-24 14:28:30 +00:00
parent f12a18504b
commit 3245201af1
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/swift/tasks/start.yml
View File

@@ -179,6 +179,8 @@
kolla_docker: kolla_docker:
action: "start_container" action: "start_container"
common_options: "{{ docker_common_options }}" common_options: "{{ docker_common_options }}"
environment:
RSYNC_CONNECT_PROG: "nc %H {{ swift_rsync_port }}"
image: "{{ swift_object_image_full }}" image: "{{ swift_object_image_full }}"
name: "swift_object_replicator" name: "swift_object_replicator"
volumes: volumes:

9
ansible/roles/swift/templates/rsyncd.conf.j2
View File

@@ -7,7 +7,8 @@ address = {{ api_interface_address }}
max connections = 2 max connections = 2
path = {{ swift_devices_mount_point }} path = {{ swift_devices_mount_point }}
read only = false read only = false
lock file = /var/lock/account.lock use chroot = no
lock file = /var/lib/swift/lock/account.lock
{% endif %} {% endif %}
{% if inventory_hostname in groups['swift-container-server'] %} {% if inventory_hostname in groups['swift-container-server'] %}
@@ -15,7 +16,8 @@ lock file = /var/lock/account.lock
max connections = 4 max connections = 4
path = {{ swift_devices_mount_point }} path = {{ swift_devices_mount_point }}
read only = false read only = false
lock file = /var/lock/container.lock use chroot = no
lock file = /var/lib/swift/lock/container.lock
{% endif %} {% endif %}
{% if inventory_hostname in groups['swift-object-server'] %} {% if inventory_hostname in groups['swift-object-server'] %}
@@ -23,5 +25,6 @@ lock file = /var/lock/container.lock
max connections = 8 max connections = 8
path = {{ swift_devices_mount_point }} path = {{ swift_devices_mount_point }}
read only = false read only = false
lock file = /var/lock/object.lock use chroot = no
lock file = /var/lib/swift/lock/object.lock
{% endif %} {% endif %}