diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml index 75b911ebbd..d5a47af40b 100644 --- a/deployment/swift/swift-storage-container-puppet.yaml +++ b/deployment/swift/swift-storage-container-puppet.yaml @@ -442,6 +442,27 @@ outputs: - /var/cache/swift:/var/cache/swift - /var/log/containers/swift:/var/log/swift:z environment: *kolla_env + swift_rsync: + image: *swift_object_image + net: host + user: root + restart: always + healthcheck: + test: /openstack/healthcheck + privileged: false + cap_add: + - NET_BIND_SERVICE + volumes: + list_concat: + - {get_attr: [ContainersCommon, volumes]} + - + - /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 + - /srv/node:/srv/node + - /dev:/dev + - /var/log/containers/swift:/var/log/swift:z + # /var/cache/swift not needed in this container + environment: *kolla_env - swift_account_reaper: image: *swift_account_image @@ -561,27 +582,6 @@ outputs: - /var/cache/swift:/var/cache/swift - /var/log/containers/swift:/var/log/swift:z environment: *kolla_env - swift_rsync: - image: *swift_object_image - net: host - user: root - restart: always - healthcheck: - test: /openstack/healthcheck - privileged: false - cap_add: - - NET_BIND_SERVICE - volumes: - list_concat: - - {get_attr: [ContainersCommon, volumes]} - - - - /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 - - /srv/node:/srv/node - - /dev:/dev - - /var/log/containers/swift:/var/log/swift:z - # /var/cache/swift not needed in this container - environment: *kolla_env - if: - swift_container_sharder_enabled -