diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 99f786bfba..c878aac9cc 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -42,8 +42,12 @@ Package: openvswitch* Pin: release n=buster Pin-Priority: 700 -# daxio in nova-compute depends on those -# in Victoria+ we have them as QEMU 5 dependencies -Package: libpmem1 libndctl6 libdaxctl1 pmdk-tools libpmemblk1 libpmemlog1 libpmemobj1 libpmempool1 +# we want newer QEMU +Package: qemu* +Pin: version 1:5.* +Pin-Priority: 700 + +# daxio and QEMU depends on those +Package: libpmem1 libndctl6 libdaxctl1 pmdk-tools libpmemblk1 libpmemlog1 libpmemobj1 libpmempool1 liburing1 libfdt1 Pin: release n=buster-backports Pin-Priority: 700 diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 9198c30823..fceac8fe97 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -59,8 +59,13 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% elif base_arch == "x86_64" %} {% set nova_libvirt_packages = nova_libvirt_packages + [ 'ovmf', - 'qemu-kvm' ] %} + # NOTE(hrw): Debian merged 'qemu-kvm' into 'qemu-system-ARCH' in 5.0-9 + {% if base_distro == 'ubuntu' %} + {% set nova_libvirt_packages = nova_libvirt_packages + [ + 'qemu-kvm' + ] %} + {% endif %} {% endif %} {% if base_arch in ['aarch64', 'x86_64'] %}