From 8a37350150500abe3928e934f59d8740c703216d Mon Sep 17 00:00:00 2001 From: Christian Schwede Date: Wed, 8 Jan 2020 20:32:29 +0100 Subject: [PATCH] Fix permission error if Barbican is enabled for Swift The config files need to be relabled too avoid permission errors, otherwise the Barbican key ID is not set and Swift fails to start. Closes-Bug: 1858845 Change-Id: Idb94fee8aee1de3b1c7338108ccd8b45b6f169bf (cherry picked from commit 77b48f39888436bb6d463aa89290fce27f074870) --- deployment/swift/swift-proxy-container-puppet.yaml | 2 +- .../notes/swift-barbican-key-id-fix-108f8b58a5092d0a.yaml | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/swift-barbican-key-id-fix-108f8b58a5092d0a.yaml diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml index 7e9750b84a..cc40277a25 100644 --- a/deployment/swift/swift-proxy-container-puppet.yaml +++ b/deployment/swift/swift-proxy-container-puppet.yaml @@ -381,7 +381,7 @@ outputs: list_concat: - {get_attr: [ContainersCommon, volumes]} - - - /var/lib/config-data/puppet-generated/swift/etc/swift:/etc/swift:rw + - /var/lib/config-data/puppet-generated/swift/etc/swift:/etc/swift:rw,z - /var/lib/container-config-scripts/set_swift_keymaster_key_id.sh:/set_swift_keymaster_key_id.sh:ro user: root command: "/set_swift_keymaster_key_id.sh" diff --git a/releasenotes/notes/swift-barbican-key-id-fix-108f8b58a5092d0a.yaml b/releasenotes/notes/swift-barbican-key-id-fix-108f8b58a5092d0a.yaml new file mode 100644 index 0000000000..26d071e123 --- /dev/null +++ b/releasenotes/notes/swift-barbican-key-id-fix-108f8b58a5092d0a.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + Fixes an issue where TripleO fails to set the Barbican key ID for Swift + with a permission error if the config files are not relabeled.