From bc97aa584689469eacdb3b80f3d2706f9c6bff96 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 24 Nov 2020 09:27:31 +0000 Subject: [PATCH] swift: fix group membership in debuntu/binary The UCA packages seem to be removing the swift user from the kolla group. Explicitly add it after installation. Closes-Bug: #1905279 Change-Id: I51c7c6e2f520a582de0409025eb5d1a6da2952a2 (cherry picked from commit aa3208ea0f10889469f864aaccdb593547412d76) --- docker/swift/swift-base/Dockerfile.j2 | 5 +++++ releasenotes/notes/bug-1905279-41d664114ef26a16.yaml | 6 ++++++ 2 files changed, 11 insertions(+) create mode 100644 releasenotes/notes/bug-1905279-41d664114ef26a16.yaml diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2 index 98940dfacc..bf622fcd4a 100644 --- a/docker/swift/swift-base/Dockerfile.j2 +++ b/docker/swift/swift-base/Dockerfile.j2 @@ -24,6 +24,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% endif %} {{ macros.install_packages(swift_base_packages | customizable("packages")) }} + {# NOTE(mgoddard): UCA packages seem to modify the group membership for #} + {# the swift user, removing it from the kolla group. #} + {% if base_package_type == 'deb' %} +RUN usermod --append --groups kolla swift + {% endif %} {% elif install_type == 'source' %} {% if base_package_type == 'rpm' %} {% set swift_base_packages = [ diff --git a/releasenotes/notes/bug-1905279-41d664114ef26a16.yaml b/releasenotes/notes/bug-1905279-41d664114ef26a16.yaml new file mode 100644 index 0000000000..c195902653 --- /dev/null +++ b/releasenotes/notes/bug-1905279-41d664114ef26a16.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + Fixes an issue with Swift containers failing to start in Ubuntu binary + images. `LP#1905279 + `__