openstack/tripleo-heat-templates
Code Issues Proposed changes

Mount /var/cache/swift across containers

Browse Source 
This is needed to ensure all containers update the same cache file used
by swift-recon to collect health and debug data.

Closes-Bug: 1734268
Change-Id: Ia586cc6277359dcb1a78194d65eaa932dd995ed3
This commit is contained in:
Christian Schwede 2017-11-24 07:13:24 +01:00
parent 7984be92db
commit 079c0ff67a
2 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docker/services/swift-storage.yaml
View File

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

7
releasenotes/notes/swift-mount-var-cache-7e95199532b542c4.yaml Normal file
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.