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

1 files changed, 1 insertions, 15 deletions

diff --git a/docker/cinder/cinder-api/Dockerfile.j2 b/docker/cinder/cinder-api/Dockerfile.j2
index 7fd822ae7..d62db9ca1 100644
--- a/docker/cinder/cinder-api/Dockerfile.j2
+++ b/docker/cinder/cinder-api/Dockerfile.j2
@@ -12,19 +12,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         {% set cinder_api_packages = [
                 'httpd',
                 'mod_ssl',
-        ] %}
-
-        {% if distro_python_version.startswith('3') %}
-        {% set cinder_api_packages = cinder_api_packages + [
                 'python3-keystone',
                 'python3-mod_wsgi'
         ] %}
-        {% else %}
-        {% set cinder_api_packages = cinder_api_packages + [
-                'mod_wsgi',
-                'python-keystone'
-        ] %}
-        {% endif %}
 {{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
 RUN mkdir -p /var/www/cgi-bin/cinder \
     && cp -a /usr/bin/cinder-wsgi /var/www/cgi-bin/cinder/cinder-wsgi \
@@ -49,12 +39,8 @@ RUN mkdir -p /var/www/cgi-bin/cinder \
         {% set cinder_api_packages = [
                 'httpd',
                 'mod_ssl',
+                'python3-mod_wsgi'
         ] %}
-        {% if distro_python_version.startswith('3') %}
-        {% set cinder_api_packages = cinder_api_packages + ['python3-mod_wsgi'] %}
-        {% else %}
-        {% set cinder_api_packages = cinder_api_packages + ['mod_wsgi'] %}
-        {% endif %}
 
 {{ macros.install_packages(cinder_api_packages | customizable("packages")) }}
 RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \