Merge "Mount /var/cache/swift across containers"

This commit is contained in:
Zuul 2017-11-27 23:49:50 +00:00 committed by Gerrit Code Review
commit 4aa6e7b419
2 changed files with 25 additions and 0 deletions

View File

@ -185,6 +185,10 @@ outputs:
dest: "/"
merge: true
preserve_properties: true
permissions:
- path: /var/cache/swift
owner: swift:swift
recurse: true
/var/lib/kolla/config_files/swift_rsync.json:
command: /usr/bin/rsync --daemon --no-detach --config=/etc/rsyncd.conf
config_files:
@ -218,6 +222,7 @@ outputs:
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
environment: &kolla_env
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
swift_account_reaper:
@ -234,6 +239,7 @@ outputs:
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
environment: *kolla_env
swift_account_replicator:
image: *swift_account_image
@ -249,6 +255,7 @@ outputs:
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
environment: *kolla_env
swift_account_server:
image: *swift_account_image
@ -266,6 +273,7 @@ outputs:
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
environment: *kolla_env
swift_container_auditor:
image: &swift_container_image {get_param: DockerSwiftContainerImage}
@ -281,6 +289,7 @@ outputs:
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
environment: *kolla_env
swift_container_replicator:
image: *swift_container_image
@ -296,6 +305,7 @@ outputs:
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
environment: *kolla_env
swift_container_updater:
image: *swift_container_image
@ -311,6 +321,7 @@ outputs:
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
environment: *kolla_env
swift_container_server:
image: *swift_container_image
@ -328,6 +339,7 @@ outputs:
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
environment: *kolla_env
swift_object_auditor:
image: &swift_object_image {get_param: DockerSwiftObjectImage}
@ -343,6 +355,7 @@ outputs:
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
environment: *kolla_env
swift_object_expirer:
image: &swift_proxy_image {get_param: DockerSwiftProxyImage}
@ -358,6 +371,7 @@ outputs:
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
environment: *kolla_env
swift_object_replicator:
image: *swift_object_image
@ -373,6 +387,7 @@ outputs:
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
environment: *kolla_env
swift_object_updater:
image: *swift_object_image
@ -388,6 +403,7 @@ outputs:
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
environment: *kolla_env
swift_object_server:
image: *swift_object_image
@ -405,6 +421,7 @@ outputs:
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
- /var/cache/swift:/var/cache/swift
environment: *kolla_env
swift_rsync:
image: *swift_object_image
@ -421,6 +438,7 @@ outputs:
- /run:/run
- /srv/node:/srv/node
- /dev:/dev
# /var/cache/swift not needed in this container
environment: *kolla_env
host_prep_tasks:

View File

@ -0,0 +1,7 @@
---
fixes:
- |
Processes are storing important health and debug data in some files within
/var/cache/swift, and these files must be shared between all swift-*
processes. Therefore it is needed to mount this directory on all Swift
containers, which is required to make swift-recon working.