openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Run rsync for Swift without xinetd"

Browse Source
This commit is contained in:
Jenkins
2017-07-13 04:07:57 +00:00
committed by Gerrit Code Review
parent 6e7e5d443c d6ae3a88e0
commit 3a20d3f0c2
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
docker/services/swift-storage.yaml
View File

@@ -188,8 +188,8 @@ outputs:
- path: /var/log/swift
owner: swift:swift
recurse: true
/var/lib/kolla/config_files/swift_xinetd_rsync.json:
command: /usr/sbin/xinetd -dontfork
/var/lib/kolla/config_files/swift_rsync.json:
command: /usr/bin/rsync --daemon --no-detach --config=/etc/rsyncd.conf
config_files:
- source: "/var/lib/kolla/config_files/src/*"
dest: "/"
@@ -428,7 +428,7 @@ outputs:
- /dev:/dev
- /var/log/containers/swift:/var/log/swift
environment: *kolla_env
swift_xinetd_rsync:
swift_rsync:
image: *swift_object_image
net: host
user: root
@@ -438,7 +438,7 @@ outputs:
list_concat:
- {get_attr: [ContainersCommon, volumes]}
-
- /var/lib/kolla/config_files/swift_xinetd_rsync.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/kolla/config_files/swift_rsync.json:/var/lib/kolla/config_files/config.json:ro
- /var/lib/config-data/puppet-generated/swift/:/var/lib/kolla/config_files/src:ro
- /run:/run
- /srv/node:/srv/node