summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schwede <cschwede@redhat.com>2017-06-06 16:12:09 +0200
committerChristian Schwede <cschwede@redhat.com>2017-06-28 10:21:57 +0000
commit891b6c7d4c41d893a7bf16caedac51874a631706 (patch)
tree39c82c4349f7945199916686c681379bbb6cbdd4
parent61fdeb67a021d8f3a74186200674b6725c0b8870 (diff)
Add missing xinetd/rsync container for Swift
Swift object replication relies on the rsync server, which is run by xinetd. This patch adds the missing container and configuration. Note that xinetd needs bind to a privileged port (873) and has to be started as root therefore. Change-Id: I7655c9dd116c0130035d8a2fae81148171ae6448
-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 017fb123..50753e43 100644
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -73,7 +73,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: &swift_proxy_image
list_join:
@@ -110,6 +110,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
@@ -340,6 +342,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: