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

2 files changed, 4 insertions, 21 deletions

diff --git a/docker/heat/heat-base/Dockerfile.j2 b/docker/heat/heat-base/Dockerfile.j2
index bd8cfb661..4819f5291 100644
--- a/docker/heat/heat-base/Dockerfile.j2
+++ b/docker/heat/heat-base/Dockerfile.j2
@@ -15,13 +15,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% set heat_base_packages = [
         'httpd',
         'mod_ssl',
-        'openstack-heat-common'
+        'openstack-heat-common',
+        'python3-mod_wsgi'
     ] %}
-    {% if distro_python_version.startswith('3') %}
-    {% set heat_base_packages = heat_base_packages + ['python3-mod_wsgi'] %}
-    {% else %}
-    {% set heat_base_packages = heat_base_packages + ['mod_wsgi'] %}
-    {% endif %}
 
 {{ macros.install_packages(heat_base_packages | customizable("packages")) }}
 RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
@@ -43,12 +39,8 @@ RUN echo > /etc/apache2/ports.conf
     {% set heat_base_packages = [
         'httpd',
         'mod_ssl',
+        'python3-mod_wsgi'
     ] %}
-    {% if distro_python_version.startswith('3') %}
-    {% set heat_base_packages = heat_base_packages + ['python3-mod_wsgi'] %}
-    {% else %}
-    {% set heat_base_packages = heat_base_packages + ['mod_wsgi'] %}
-    {% endif %}
 
 {{ macros.install_packages(heat_base_packages | customizable("packages")) }}
 RUN sed -i -r 's,^(Listen 80),#\1,' /etc/httpd/conf/httpd.conf \
diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2
index fcb958109..04fa30486 100644
--- a/docker/heat/heat-engine/Dockerfile.j2
+++ b/docker/heat/heat-engine/Dockerfile.j2
@@ -10,19 +10,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% if install_type == 'binary' %}
     {% if base_package_type == 'rpm' %}
         {% set heat_engine_packages = [
-            'openstack-heat-engine'
-        ] %}
-        {% if distro_python_version.startswith('3') %}
-        {% set heat_engine_packages = heat_engine_packages + [
+            'openstack-heat-engine',
             'python3-barbicanclient',
             'python3-zaqarclient'
         ] %}
-        {% else %}
-        {% set heat_engine_packages = heat_engine_packages + [
-            'python-barbicanclient',
-            'python-zaqarclient'
-        ] %}
-        {% endif %}
     {% elif base_package_type == 'deb' %}
         {% set heat_engine_packages = ['heat-engine'] %}
     {% endif %}