Merge "Do not relabel Swift files on every container start"

openstack-archive · Jan 20, 2021 · 1c4adfc · 1c4adfc
2 parents 3b69e18 + 191d160
commit 1c4adfc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml
@@ -340,7 +340,7 @@ outputs:
                       -
                         - /var/lib/kolla/config_files/swift_account_auditor.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:z
+                        - /srv/node:/srv/node
                         - /dev:/dev
                         - /var/cache/swift:/var/cache/swift:z
                         - /var/log/containers/swift:/var/log/swift:z
@@ -445,7 +445,7 @@ outputs:
                     -
                       - /var/lib/kolla/config_files/swift_account_reaper.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:z
+                      - /srv/node:/srv/node
                       - /dev:/dev
                       - /var/cache/swift:/var/cache/swift:z
                       - /var/log/containers/swift:/var/log/swift:z

diff --git a/releasenotes/notes/swift-prevent-relabeling-b9721aa5a1abda6e.yaml b/releasenotes/notes/swift-prevent-relabeling-b9721aa5a1abda6e.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Do not relabel Swift files on every container (re-)start. These will be
+    relabeled already in step 3 preventing additional delays.