aboutsummaryrefslogtreecommitdiff
path: root/docker/barbican
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2020-03-09 17:44:54 +0100
committerMark Goddard <mark@stackhpc.com>2020-04-15 09:32:06 +0000
commit53443c5c712f4ec23b859105e94bcd90abc27762 (patch)
tree5bc6d8db4c65519e16d231b55f574e813e29da4b /docker/barbican
parenta176c6e080be2e71829e8ca5e8b330fdda70038a (diff)
downloadkolla-53443c5c712f4ec23b859105e94bcd90abc27762.tar.gz
kolla-53443c5c712f4ec23b859105e94bcd90abc27762.zip
Remove support for CentOS 7
With the move to RHEL/CentOS 8 we no longer have Python 2 in our images so there is no need for checking which Python version (2.x or 3.x) is used inside of containers. We also no longer have to support yum as a value for distro_package_manager. Partially-Implements: blueprint centos-rhel-8 Change-Id: Ie45cf3465fedddbde7856961527421883ba3d5c9
Diffstat (limited to 'docker/barbican')
-rw-r--r--docker/barbican/barbican-api/Dockerfile.j212
-rw-r--r--docker/barbican/barbican-base/Dockerfile.j25
2 files changed, 1 insertions, 16 deletions
diff --git a/docker/barbican/barbican-api/Dockerfile.j2 b/docker/barbican/barbican-api/Dockerfile.j2
index 5f6bd8fb4..a789668e5 100644
--- a/docker/barbican/barbican-api/Dockerfile.j2
+++ b/docker/barbican/barbican-api/Dockerfile.j2
@@ -12,20 +12,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set barbican_api_packages = [
'httpd',
'mod_ssl',
- 'openstack-barbican-api'
- ] %}
-
- {% if distro_python_version.startswith('3') %}
- {% set barbican_api_packages = barbican_api_packages + [
+ 'openstack-barbican-api',
'python3-mod_wsgi',
'uwsgi-plugin-python3'
] %}
- {% else %}
- {% set barbican_api_packages = barbican_api_packages + [
- 'mod_wsgi',
- 'uwsgi-plugin-python'
- ] %}
- {% endif %}
{{ 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 ff10d53ad..fb4cf4ea6 100644
--- a/docker/barbican/barbican-base/Dockerfile.j2
+++ b/docker/barbican/barbican-base/Dockerfile.j2
@@ -20,12 +20,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% elif install_type == 'source' %}
{% if base_package_type == 'rpm' %}
- {% if distro_python_version.startswith('3') %}
{% set barbican_base_packages = ['uwsgi-plugin-python3'] %}
- {% else %}
- {% set barbican_base_packages = ['uwsgi-plugin-python'] %}
- {% endif %}
-
{% elif base_package_type == 'deb' %}
{% set barbican_base_packages = ['uwsgi-plugin-python3'] %}
{% endif %}