From d45e2295d9eebab68eb635875d479379636cbef3 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 24 Sep 2018 10:12:32 +0100 Subject: [PATCH] Rename uwsgi-plugin-python to uwsgi-plugin-python2 in CentOS On Queens and earlier builds, source CentOS images fail with this error: INFO:kolla.common.utils.barbican-base:No package uwsgi-plugin-python available. INFO:kolla.common.utils.barbican-base:1mError: Not tolerating missing names on install, stopping. INFO:kolla.common.utils.barbican-base:m CentOS binary builds fail with a similar error in the barbican-api image. This seems to have been caused by a rename of uwsgi-plugin-python to uwsgi-plugin-python2 [1]. That bug report claims that a virtual provides will be added to the package to make the change backwards compatible, but this does not seem to have been done yet. [1] https://bugzilla.redhat.com/show_bug.cgi?id=1628147 Change-Id: If9b43dbf3fab6a76f47a0e4fb9213c5efa655c0d Closes-Bug: #1794039 --- docker/barbican/barbican-api/Dockerfile.j2 | 2 +- docker/barbican/barbican-base/Dockerfile.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/barbican/barbican-api/Dockerfile.j2 b/docker/barbican/barbican-api/Dockerfile.j2 index 4a0d53faa8..adbd20e9c2 100644 --- a/docker/barbican/barbican-api/Dockerfile.j2 +++ b/docker/barbican/barbican-api/Dockerfile.j2 @@ -12,7 +12,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'mod_ssl', 'mod_wsgi', 'openstack-barbican-api', - 'uwsgi-plugin-python' + 'uwsgi-plugin-python2' ] %} {{ macros.install_packages(barbican_api_packages | customizable("packages")) }} diff --git a/docker/barbican/barbican-base/Dockerfile.j2 b/docker/barbican/barbican-base/Dockerfile.j2 index 2fbfc24d79..648ff0c1e1 100644 --- a/docker/barbican/barbican-base/Dockerfile.j2 +++ b/docker/barbican/barbican-base/Dockerfile.j2 @@ -18,7 +18,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif install_type == 'source' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set barbican_base_packages = ['uwsgi-plugin-python'] %} + {% set barbican_base_packages = ['uwsgi-plugin-python2'] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set barbican_base_packages = ['uwsgi-plugin-python'] %} {% endif %}