From 53443c5c712f4ec23b859105e94bcd90abc27762 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
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/glance/glance-api/Dockerfile.j2  |  7 +------
 docker/glance/glance-base/Dockerfile.j2 | 21 +--------------------
 2 files changed, 2 insertions(+), 26 deletions(-)

(limited to 'docker/glance')

diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2
index 5f6635faa..7b42c8d12 100644
--- a/docker/glance/glance-api/Dockerfile.j2
+++ b/docker/glance/glance-api/Dockerfile.j2
@@ -8,12 +8,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 {% if base_package_type == 'rpm' %}
-    {% if distro_package_manager == 'dnf' or base_distro not in ['centos'] %}
-        {% set glance_api_packages = ['qemu-img'] %}
-    {% else %}
-        {% set glance_api_packages = ['qemu-img-ev'] %}
-    {% endif %}
-    {% set glance_api_packages = glance_api_packages + ['nfs-utils'] %}
+    {% set glance_api_packages = ['qemu-img'] %}
 {% elif base_package_type == 'deb' %}
     {% set glance_api_packages = [
         'nfs-common',
diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2
index f63e89936..b5d6d00c7 100644
--- a/docker/glance/glance-base/Dockerfile.j2
+++ b/docker/glance/glance-base/Dockerfile.j2
@@ -14,21 +14,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% if install_type == 'binary' %}
     {% if base_package_type == 'rpm' %}
         {% set glance_base_packages = [
-            'openstack-glance'
-        ] %}
-        {% if distro_python_version.startswith('3') %}
-        {% set glance_base_packages = glance_base_packages + [
+            'openstack-glance',
             'python3-oslo-vmware',
             'python3-rados',
             'python3-rbd'
         ] %}
-        {% else %}
-        {% set glance_base_packages = glance_base_packages + [
-            'python-oslo-vmware',
-            'python-rados',
-            'python-rbd'
-        ] %}
-        {% endif %}
     {% elif base_package_type == 'deb' %}
         {% set glance_base_packages = [
             'glance',
@@ -36,8 +26,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python3-oslo.vmware',
             'python3-rados',
             'python3-rbd',
-            'python3-rados',
-            'python3-rbd'
         ] %}
     {% endif %}
 
@@ -45,17 +33,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% elif install_type == 'source' %}
     {% if base_package_type == 'rpm' %}
-        {% if distro_python_version.startswith('3') %}
         {% set glance_base_packages = [
             'python3-rados',
             'python3-rbd'
         ] %}
-        {% else %}
-        {% set glance_base_packages = [
-            'python-rados',
-            'python-rbd'
-        ] %}
-        {% endif %}
     {% elif base_package_type == 'deb' %}
         {% set glance_base_packages = [
             'python3-rados',
-- 
cgit v1.2.3