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/ceilometer/ceilometer-base/Dockerfile.j2    | 13 +------------
 docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 12 +++---------
 2 files changed, 4 insertions(+), 21 deletions(-)

(limited to 'docker/ceilometer')

diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2
index 331a9d203..23a35a1cc 100644
--- a/docker/ceilometer/ceilometer-base/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2
@@ -12,23 +12,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% if install_type == 'binary' %}
     {% if base_package_type == 'rpm' %}
         {% set ceilometer_base_packages = [
-            'openstack-ceilometer-common'
-        ] %}
-        {% if distro_python_version.startswith('3') %}
-        {% set ceilometer_base_packages = ceilometer_base_packages + [
+            'openstack-ceilometer-common',
             'python3-gnocchiclient',
             'python3-oslo-db',
             'python3-panko',
             'python3-tooz'
          ] %}
-        {% else %}
-        {% set ceilometer_base_packages = ceilometer_base_packages + [
-            'python-gnocchiclient',
-            'python-oslo-db',
-            'python-panko',
-            'python-tooz'
-         ] %}
-        {% endif %}
     {% elif base_package_type == 'deb' %}
         {% set ceilometer_base_packages = [
             'ceilometer-common',
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
index ec6239803..a02e99fdb 100644
--- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
@@ -22,15 +22,9 @@ 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 ceilometer_compute_packages = [
-                'python3-libvirt'
-             ] %}
-        {% else %}
-            {% set ceilometer_compute_packages = [
-                'libvirt-python'
-             ] %}
-        {% endif %}
+        {% set ceilometer_compute_packages = [
+            'python3-libvirt'
+         ] %}
     {% elif base_package_type == 'deb' %}
         {% set ceilometer_compute_packages = [
             'python3-libvirt'
-- 
cgit v1.2.3