From 4b4e26262b9e03190c639481fb60a8f4f92c532a Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 17 Dec 2019 13:01:42 +0000 Subject: CentOS 8: Update packages in images * Some further changes for python2 vs python3 packages * Allow rabbitmq 3.7.*, since a newer erlang is available * Switch from qemu-img-ev to qemu-img on CentOS 8 * bridge-utils no longer available on CentOS 8 * libvirt-daemon-driver-lxc no longer available on CentOS 8 * Mark some more images buildable for CentOS 8 Change-Id: Iaf5b68ff6d944ae730ca0b1d5832172c106a6c08 Partially-Implements: blueprint centos-rhel-8 Partially-Implements: blueprint centos-rhel-python-3 --- docker/nova/nova-compute/Dockerfile.j2 | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'docker/nova/nova-compute') 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' %} -- cgit v1.2.3