From 53443c5c712f4ec23b859105e94bcd90abc27762 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 9 Mar 2020 17:44:54 +0100 Subject: 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 --- docker/vitrage/vitrage-api/Dockerfile.j2 | 12 +----------- docker/vitrage/vitrage-base/Dockerfile.j2 | 10 ---------- 2 files changed, 1 insertion(+), 21 deletions(-) (limited to 'docker/vitrage') diff --git a/docker/vitrage/vitrage-api/Dockerfile.j2 b/docker/vitrage/vitrage-api/Dockerfile.j2 index b4b006480..169a4b12b 100644 --- a/docker/vitrage/vitrage-api/Dockerfile.j2 +++ b/docker/vitrage/vitrage-api/Dockerfile.j2 @@ -14,20 +14,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set vitrage_api_packages = [ 'httpd', 'mod_ssl', - 'openstack-vitrage-api' - ] %} - - {% if distro_python_version.startswith('3') %} - {% set vitrage_api_packages = vitrage_api_packages + [ + 'openstack-vitrage-api', 'python3-ldappool', 'python3-mod_wsgi' ] %} - {% else %} - {% set vitrage_api_packages = vitrage_api_packages + [ - 'mod_wsgi', - 'python2-ldappool' - ] %} - {% endif %} {{ macros.install_packages(vitrage_api_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ diff --git a/docker/vitrage/vitrage-base/Dockerfile.j2 b/docker/vitrage/vitrage-base/Dockerfile.j2 index bf53705c9..9c6188ffc 100644 --- a/docker/vitrage/vitrage-base/Dockerfile.j2 +++ b/docker/vitrage/vitrage-base/Dockerfile.j2 @@ -47,19 +47,9 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ {% set vitrage_base_packages = [ 'httpd', 'mod_ssl', - ] %} - {% if distro_python_version.startswith('3') %} - {% set vitrage_base_packages = vitrage_base_packages + [ 'python3-ldappool', 'python3-mod_wsgi' ] %} - {% else %} - {% set vitrage_base_packages = vitrage_base_packages + [ - 'mod_wsgi', - 'python2-ldappool' - ] %} - {% endif %} - {{ macros.install_packages(vitrage_base_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ -- cgit v1.2.3