Merge "Do not run Swift rsync container in single replica mode"
This commit is contained in:
commit
fd3b527239
|
@ -443,6 +443,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
|
||||||
|
@ -562,27 +583,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:
|
||||||
- {get_param: SwiftContainerSharderEnabled}
|
- {get_param: SwiftContainerSharderEnabled}
|
||||||
- swift_container_sharder:
|
- swift_container_sharder:
|
||||||
|
|
Loading…
Reference in New Issue