Merge "CentOS 8: Update packages in images"

3 files changed, 40 insertions, 9 deletions

diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2
index a8e103694..ff41c0fbe 100644
--- a/docker/nova/nova-compute/Dockerfile.j2
+++ b/docker/nova/nova-compute/Dockerfile.j2
@@ -83,18 +83,36 @@ RUN rm -f /etc/nova/nova-compute.conf
             'e2fsprogs',
             'genisoimage',
             'iscsi-initiator-utils',
-            'libvirt-python',
             'libosinfo',
             'nfs-utils',
             'openvswitch',
             'parted',
-            'python-libguestfs',
-            'python-rtslib',
-            'qemu-img-ev',
             '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 + [
+            'qemu-img',
+        ] %}
+        {% else %}
+        {% set nova_compute_packages = nova_compute_packages + [
+            'qemu-img-ev',
+        ] %}
+        {% endif %}
 
     {% elif base_package_type == 'deb' %}
 
diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2
index 12ca843ef..293020d60 100644
--- a/docker/nova/nova-libvirt/Dockerfile.j2
+++ b/docker/nova/nova-libvirt/Dockerfile.j2
@@ -18,18 +18,22 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'libvirt-client',
         'libvirt-daemon',
         'libvirt-daemon-config-nwfilter',
-        'libvirt-daemon-driver-lxc',
         'libvirt-daemon-driver-nwfilter',
         'openvswitch',
         'trousers'
     ] %}
-    {% if base_distro in ['centos'] %}
+    {% if distro_package_manager == 'dnf' or base_distro not in ['centos'] %}
         {% set nova_libvirt_packages = nova_libvirt_packages + [
-            'qemu-kvm-ev'
+            'qemu-kvm'
         ] %}
     {% else %}
         {% set nova_libvirt_packages = nova_libvirt_packages + [
-            'qemu-kvm'
+            'qemu-kvm-ev'
+        ] %}
+    {% endif %}
+    {% if distro_package_manager != 'dnf' %}
+        {% set nova_libvirt_packages = nova_libvirt_packages + [
+            'libvirt-daemon-driver-lxc',
         ] %}
     {% endif %}
 
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
index 57b439766..b5da34c12 100644
--- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
+++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2
@@ -36,10 +36,19 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% if base_package_type == 'rpm' %}
 
         {% set nova_spicehtml5proxy_packages = [
-            'numpy',
             'spice-html5'
         ] %}
 
+        {% if distro_python_version.startswith('3') %}
+        {% set nova_spicehtml5proxy_packages = nova_spicehtml5proxy_packages + [
+            'python3-numpy',
+        ] %}
+        {% else %}
+        {% set nova_spicehtml5proxy_packages = nova_spicehtml5proxy_packages + [
+            'numpy',
+        ] %}
+        {% endif %}
+
     {% elif base_package_type == 'deb' %}
 
         {% set nova_spicehtml5proxy_packages = [