Merge "Move uwsgi installation to openstack-base"

Author: Zuul

docker/barbican/barbican-base/Dockerfile.j2

@@ -9,19 +9,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='barbican', groups='nfast') }}
 
-{% if base_package_type == 'rpm' %}
-    {% set barbican_base_packages = ['uwsgi-plugin-python3'] %}
-{% elif base_package_type == 'deb' %}
-    {% set barbican_base_packages = ['uwsgi-plugin-python3'] %}
-{% endif %}
-
 {{ macros.install_packages(barbican_base_packages | customizable("packages")) }}
 
 {% set barbican_base_pip_packages = [
     '/barbican',
     'pastedeploy',
     'python-barbicanclient',
-    'uwsgi'
 ] %}
 
 ADD barbican-base-archive /barbican-base-source

docker/openstack-base/Dockerfile.j2

@@ -30,6 +30,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'python3-devel',
         'python3-mod_wsgi',
         'sqlite-devel',
+        'uwsgi-plugin-python3',
         'zip'
     ] %}
 
@@ -51,6 +52,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'pkg-config',
         'python3-dev',
         'python3-venv',
+        'uwsgi-plugin-python3',
         'zip'
     ] %}
 
@@ -175,6 +177,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'stevedore',
         'tooz[consul,etcd,etcd3gw,zake,redis,postgresql,mysql,zookeeper,memcached,ipc]',
         'unicodecsv',
+        'uwsgi',
         'warlock',
         'wrapt'
     ]

releasenotes/notes/uwsgi-openstack-base-ac583652d29ea0e4.yaml

@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    ``uwsgi`` and ``uwsgi-plugin-python3`` installation has been moved from
+    ``barbican-base`` image to ``openstack-base``.