aboutsummaryrefslogtreecommitdiff
path: root/docker/swift
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2020-11-24 09:27:31 +0000
committerMark Goddard <mark@stackhpc.com>2020-11-24 09:28:03 +0000
commitaa3208ea0f10889469f864aaccdb593547412d76 (patch)
tree9b972fea47c4e0414e0e39930cd01b8020f3bf1a /docker/swift
parent3ad0c1212978fba797c79cf1017c293a8839b7be (diff)
downloadkolla-aa3208ea0f10889469f864aaccdb593547412d76.tar.gz
kolla-aa3208ea0f10889469f864aaccdb593547412d76.zip
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
Diffstat (limited to 'docker/swift')
-rw-r--r--docker/swift/swift-base/Dockerfile.j25
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/swift/swift-base/Dockerfile.j2 b/docker/swift/swift-base/Dockerfile.j2
index 98940dfac..bf622fcd4 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 = [