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

3 files changed, 6 insertions, 50 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 \
diff --git a/docker/cinder/cinder-base/Dockerfile.j2 b/docker/cinder/cinder-base/Dockerfile.j2
index 6dc63b36c..08b4ec51d 100644
--- a/docker/cinder/cinder-base/Dockerfile.j2
+++ b/docker/cinder/cinder-base/Dockerfile.j2
@@ -17,20 +17,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
                 'ceph-common',
                 'lvm2',
                 'cryptsetup',
-                'openstack-cinder'
-        ] %}
-
-        {% if distro_python_version.startswith('3') %}
-        {% set cinder_base_packages = cinder_base_packages + [
+                'openstack-cinder',
                 'python3-automaton',
                 'python3-oslo-vmware'
         ] %}
-        {% else %}
-        {% set cinder_base_packages = cinder_base_packages + [
-                'python-automaton',
-                'python-oslo-vmware'
-        ] %}
-        {% endif %}
     {% elif base_package_type == 'deb' %}
         {% set cinder_base_packages = [
                 'ceph-common',
@@ -49,18 +39,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% if base_package_type == 'rpm' %}
         {% set cinder_base_packages = [
                 'ceph-common',
-                'lvm2',
                 'cryptsetup',
-        ] %}
-        {% if distro_package_manager == 'dnf' or base_distro not in ['centos'] %}
-            {% set cinder_base_packages = cinder_base_packages + [
+                'lvm2',
                 'qemu-img'
-            ] %}
-        {% else %}
-            {% set cinder_base_packages = cinder_base_packages + [
-                 'qemu-img-ev'
-            ] %}
-        {% endif %}
+        ] %}
     {% elif base_package_type == 'deb' %}
         {% set cinder_base_packages = [
                 'ceph-common',
diff --git a/docker/cinder/cinder-volume/Dockerfile.j2 b/docker/cinder/cinder-volume/Dockerfile.j2
index 3e9dba3d1..f95cfb684 100644
--- a/docker/cinder/cinder-volume/Dockerfile.j2
+++ b/docker/cinder/cinder-volume/Dockerfile.j2
@@ -11,26 +11,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% set cinder_volume_packages = [
             'nfs-utils',
             'nvmetcli',
-            'sysfsutils',
-            'targetcli'
-    ] %}
-    {% if distro_python_version.startswith('3') %}
-    {% set cinder_volume_packages = cinder_volume_packages + [
             'python3-rtslib',
             'python3-cinderlib',
+            'sysfsutils',
+            'targetcli'
     ] %}
-    {% else %}
-    {% set cinder_volume_packages = cinder_volume_packages + [
-            'python-rtslib',
-            'python2-cinderlib',
-    ] %}
-    {% endif %}
 {{ macros.install_packages(cinder_volume_packages | customizable("packages")) }}
 
 {% block cinder_volume_redhat_setup %}
-{% if distro_package_manager == 'yum' %}
-RUN sed -i '1 i include /var/lib/cinder/volumes/*' /etc/tgt/tgtd.conf
-{% endif %}
 {% endblock %}
 
 {% elif base_package_type == 'deb' %}