aboutsummaryrefslogtreecommitdiff
path: root/docker/nova
diff options
context:
space:
mode:
authorMichal Nasiadka <mnasiadka@gmail.com>2024-02-02 15:40:28 +0100
committerMichal Arbet <michal.arbet@ultimum.io>2024-09-30 23:13:43 +0200
commit5f9850c5edaa53399b10fb76b0cc1b759aa4e059 (patch)
treef9d211ed227e96f24d0d197ea345c229e251301a /docker/nova
parent55168f909d3c95b6dfc386d3fbee25fd20a7cae8 (diff)
downloadkolla-5f9850c5edaa53399b10fb76b0cc1b759aa4e059.tar.gz
kolla-5f9850c5edaa53399b10fb76b0cc1b759aa4e059.zip
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
Diffstat (limited to 'docker/nova')
-rw-r--r--docker/nova/nova-libvirt/Dockerfile.j26
1 files changed, 0 insertions, 6 deletions
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'] %}