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/nova/nova-compute/Dockerfile.j2 | 43 ++++++----------------------------
 1 file changed, 7 insertions(+), 36 deletions(-)

(limited to 'docker/nova/nova-compute')

diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index ec6157d33..248695fdf 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -23,25 +23,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'openstack-nova-compute',
             'openvswitch',
             'parted',
+            'python3-libguestfs',
+            'python3-oslo-vmware',
+            'python3-rtslib',
             'sysfsutils',
             'targetcli',
             'xfsprogs'
         ] %}
 
-        {% if distro_python_version.startswith('3') %}
-        {% set nova_compute_packages = nova_compute_packages + [
-            'python3-libguestfs',
-            'python3-oslo-vmware',
-            'python3-rtslib'
-        ] %}
-        {% else %}
-        {% set nova_compute_packages = nova_compute_packages + [
-            'python-libguestfs',
-            'python-oslo-vmware',
-            'python-rtslib'
-        ] %}
-        {% endif %}
-
 {{ macros.install_packages(nova_compute_packages | customizable("packages")) }}
 
     {% elif base_package_type == 'deb' %}
@@ -89,32 +78,14 @@ RUN rm -f /etc/nova/nova-compute.conf
             'nfs-utils',
             'openvswitch',
             'parted',
-            'sysfsutils',
-            'targetcli',
-            'xfsprogs'
-        ] %}
-        {% if distro_python_version.startswith('3') %}
-        {% set nova_compute_packages = nova_compute_packages + [
             'python3-libguestfs',
             'python3-libvirt',
-            'python3-rtslib'
-        ] %}
-        {% else %}
-        {% set nova_compute_packages = nova_compute_packages + [
-            'libvirt-python',
-            'python-libguestfs',
-            'python-rtslib'
-        ] %}
-        {% endif %}
-        {% if distro_package_manager == 'dnf' %}
-        {% set nova_compute_packages = nova_compute_packages + [
+            'python3-rtslib',
             'qemu-img',
+            'sysfsutils',
+            'targetcli',
+            'xfsprogs'
         ] %}
-        {% else %}
-        {% set nova_compute_packages = nova_compute_packages + [
-            'qemu-img-ev',
-        ] %}
-        {% endif %}
 
     {% elif base_package_type == 'deb' %}
 
-- 
cgit v1.2.3