From 5f9850c5edaa53399b10fb76b0cc1b759aa4e059 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Fri, 2 Feb 2024 15:40:28 +0100 Subject: Switch to Ubuntu 24.04 LTS Add setuptools because Python3.12 dropped distutils Needed-By: https://review.opendev.org/c/openstack/kolla-ansible/+/925581 Change-Id: Ie12c43dc1de122c203edc28181366457ccd67834 --- docker/nova/nova-libvirt/Dockerfile.j2 | 6 ------ 1 file changed, 6 deletions(-) (limited to 'docker/nova/nova-libvirt') diff --git a/docker/nova/nova-libvirt/Dockerfile.j2 b/docker/nova/nova-libvirt/Dockerfile.j2 index 1f487194a..dc85ce1fa 100644 --- a/docker/nova/nova-libvirt/Dockerfile.j2 +++ b/docker/nova/nova-libvirt/Dockerfile.j2 @@ -68,12 +68,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set nova_libvirt_packages = nova_libvirt_packages + [ 'ovmf', ] %} - # 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_distro in ['debian'] %} -- cgit v1.2.3