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/placement/placement-api/Dockerfile.j2 | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'docker/placement') diff --git a/docker/placement/placement-api/Dockerfile.j2 b/docker/placement/placement-api/Dockerfile.j2 index 078167736..01e32c196 100644 --- a/docker/placement/placement-api/Dockerfile.j2 +++ b/docker/placement/placement-api/Dockerfile.j2 @@ -13,13 +13,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set placement_api_packages = [ 'httpd', 'mod_ssl', - 'openstack-placement-api' + 'openstack-placement-api', + 'python3-mod_wsgi' ] %} - {% if distro_python_version.startswith('3') %} - {% set placement_api_packages = placement_api_packages + ['python3-mod_wsgi'] %} - {% else %} - {% set placement_api_packages = placement_api_packages + ['mod_wsgi'] %} - {% endif %} {{ macros.install_packages(placement_api_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ @@ -44,12 +40,8 @@ RUN truncate -s 0 /etc/apache2/ports.conf \ {% set placement_api_packages = [ 'httpd', 'mod_ssl', + 'python3-mod_wsgi' ] %} - {% if distro_python_version.startswith('3') %} - {% set placement_api_packages = placement_api_packages + ['python3-mod_wsgi'] %} - {% else %} - {% set placement_api_packages = placement_api_packages + ['mod_wsgi'] %} - {% endif %} {{ macros.install_packages(placement_api_packages | customizable("packages")) }} RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \ -- cgit v1.2.3