openstack/kolla-ansible
Code Issues Proposed changes

Merge "Update swift for replication issues"

Browse Source
This commit is contained in:
Zuul 2017-11-29 11:13:40 +00:00 committed by Gerrit Code Review
commit 7576dcc44c
2 changed files with 8 additions and 3 deletions
Show Stats 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:
action: "start_container"
common_options: "{{ docker_common_options }}"
environment:
RSYNC_CONNECT_PROG: "nc %H {{ swift_rsync_port }}"
image: "{{ swift_object_image_full }}"
name: "swift_object_replicator"
volumes:

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

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