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, 3 insertions, 9 deletions

diff --git a/docker/freezer/freezer-api/Dockerfile.j2 b/docker/freezer/freezer-api/Dockerfile.j2
index 702d8719f..f6bba058c 100644
--- a/docker/freezer/freezer-api/Dockerfile.j2
+++ b/docker/freezer/freezer-api/Dockerfile.j2
@@ -18,12 +18,8 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
         {% set freezer_api_packages = [
             'httpd',
             'mod_ssl',
-        ] %}
-        {% if distro_python_version.startswith('3') %}
-        {% set freezer_api_packages = freezer_api_packages + ['python3-mod_wsgi'] %}
-        {% else %}
-        {% set freezer_api_packages = freezer_api_packages + ['mod_wsgi'] %}
-        {% endif %}
+            'python3-mod_wsgi'
+    ] %}
 
 {{ macros.install_packages(freezer_api_packages | customizable("packages")) }}
 
diff --git a/docker/freezer/freezer-base/Dockerfile.j2 b/docker/freezer/freezer-base/Dockerfile.j2
index 299f56985..94c53283d 100644
--- a/docker/freezer/freezer-base/Dockerfile.j2
+++ b/docker/freezer/freezer-base/Dockerfile.j2
@@ -10,9 +10,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.configure_user(name='freezer') }}
 
 {# NOTE(mgoddard): EPEL required for trickle package. Not provided by EPEL8 #}
-{% if distro_package_manager == 'yum' %}
 {{ macros.enable_extra_repos(['epel']) }}
-{% endif %}
 
 {% if install_type == 'binary' %}
 
@@ -20,7 +18,7 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
     && /bin/false
 
 {% elif install_type == 'source' %}
-    {% if distro_package_manager != 'dnf' %}
+    {% if base_package_type != 'rpm' %}
         {% set freezer_base_packages = [
             'trickle'
         ] %}