diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-13 04:07:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-13 04:07:57 +0000 |
| commit | 3a20d3f0c22663a9bb6d6fc2795adc8cc1d3939b (patch) | |
| tree | 2bf59d64346d20be49258d32dbdb321be54c8e5e | |
| parent | 6e7e5d443c98a3a9fb50cbf8815b4a57165034e4 (diff) | |
| parent | d6ae3a88e0465f5d9857afb6344f1fcc18b7d4a2 (diff) | |
Merge "Run rsync for Swift without xinetd"
| -rw-r--r-- | docker/services/swift-storage.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml index d795818f..a07c92ae 100644 --- a/docker/services/swift-storage.yaml +++ b/docker/services/swift-storage.yaml @@ -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 |