Merge "swift: fix group membership in debuntu/binary" into stable/victoria

Author: Zuul

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 = [

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>`__