aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docker/swift/swift-base/Dockerfile.j25
-rw-r--r--releasenotes/notes/bug-1905279-41d664114ef26a16.yaml6
2 files changed, 11 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 = [
diff --git a/releasenotes/notes/bug-1905279-41d664114ef26a16.yaml b/releasenotes/notes/bug-1905279-41d664114ef26a16.yaml
new file mode 100644
index 000000000..c19590265
--- /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
+ <https://bugs.launchpad.net/kolla-ansible/+bug/1905279>`__