openstack/tripleo-heat-templates
Code Issues Proposed changes

Do not run Swift rsync container in single replica mode

Browse Source 
When Swift is running in single replica mode, rsync is pretty much
useless - there is no counterpart to transfer data.

On the undercloud this also prevents misleading error messages if
xinetd is running and already using port 873.

Change-Id: I7e22dbe287bf9c93438717c08a3ceb1998445b93
(cherry picked from commit 91f06efb3a)
This commit is contained in:
Christian Schwede 2021-06-17 11:18:43 +02:00 committed by Jesse Pretorius
parent faa3fc74cf
commit 52f26b6fb9
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
deployment/swift/swift-storage-container-puppet.yaml
View File

@ -442,6 +442,27 @@ outputs:
- /var/cache/swift:/var/cache/swift - /var/cache/swift:/var/cache/swift
- /var/log/containers/swift:/var/log/swift:z - /var/log/containers/swift:/var/log/swift:z
environment: *kolla_env 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: swift_account_reaper:
image: *swift_account_image image: *swift_account_image
@ -561,27 +582,6 @@ outputs:
- /var/cache/swift:/var/cache/swift - /var/cache/swift:/var/cache/swift
- /var/log/containers/swift:/var/log/swift:z - /var/log/containers/swift:/var/log/swift:z
environment: *kolla_env 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: - if:
- swift_container_sharder_enabled - swift_container_sharder_enabled
- -