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-libvirt/Dockerfile.j2 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'docker/nova/nova-libvirt') 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 %} -- cgit v1.2.3