summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-30 04:12:32 +0000
committerGerrit Code Review <review@openstack.org>2017-06-30 04:12:32 +0000
commita396ac325af8950acb18227f1a6a487159776020 (patch)
tree57a9cdde048dc0f0ef655162c94a2b845a1523bb
parenta759deedf0fb599d4fba89fc8741623f68a16322 (diff)
parent891b6c7d4c41d893a7bf16caedac51874a631706 (diff)
Merge "Add missing xinetd/rsync container for Swift"
-rw-r--r--docker/services/swift-storage.yaml22
1 files changed, 21 insertions, 1 deletions
diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index 011e6d42..f2b8c474 100644
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -86,7 +86,7 @@ outputs:
# BEGIN DOCKER SETTINGS
puppet_config:
config_volume: swift
- puppet_tags: swift_config,swift_container_config,swift_container_sync_realms_config,swift_account_config,swift_object_config,swift_object_expirer_config
+ puppet_tags: swift_config,swift_container_config,swift_container_sync_realms_config,swift_account_config,swift_object_config,swift_object_expirer_config,rsync::server
step_config: *step_config
config_image:
list_join:
@@ -123,6 +123,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
docker_config:
step_3:
# The puppet config sets this up but we don't have a way to mount the named
@@ -356,6 +358,24 @@ outputs:
- /dev:/dev
- /var/log/containers/swift:/var/log/swift
environment: *kolla_env
+ swift_xinetd_rsync:
+ image: *swift_object_image
+ net: host
+ user: root
+ restart: always
+ privileged: true
+ volumes:
+ 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/config-data/swift/etc:/etc
+ - /run:/run
+ - /srv/node:/srv/node
+ - /dev:/dev
+ - /var/log/containers/swift:/var/log/swift
+ environment: *kolla_env
+
host_prep_tasks:
- name: create persistent directories
file: