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/base/sources.list.ubuntu | 10 +++++----- docker/base/sources.list.ubuntu.aarch64 | 10 +++++----- docker/nova/nova-libvirt/Dockerfile.j2 | 6 ------ 3 files changed, 10 insertions(+), 16 deletions(-) (limited to 'docker') diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu index eda3083d1..158cbb085 100644 --- a/docker/base/sources.list.ubuntu +++ b/docker/base/sources.list.ubuntu @@ -1,16 +1,16 @@ # For non-x86 architectures we use sources.list.ubuntu. # Default repos -deb mirror://mirrors.ubuntu.com/mirrors.txt jammy main universe -deb mirror://mirrors.ubuntu.com/mirrors.txt jammy-updates main universe -deb mirror://mirrors.ubuntu.com/mirrors.txt jammy-security main universe +deb mirror://mirrors.ubuntu.com/mirrors.txt noble main universe +deb mirror://mirrors.ubuntu.com/mirrors.txt noble-updates main universe +deb mirror://mirrors.ubuntu.com/mirrors.txt noble-security main universe # Backports have a lower priority and must be explicitly installed to be used -deb http://archive.ubuntu.com/ubuntu/ jammy-backports main universe +deb http://archive.ubuntu.com/ubuntu/ noble-backports main universe # We need to add the repo for the updated packages they provide. The main ones # are qemu, libvirt, and openvswitch. -deb http://ubuntu-cloud.archive.canonical.com/ubuntu jammy-updates/caracal main +deb http://ubuntu-cloud.archive.canonical.com/ubuntu noble-updates/dalmatian main # NOTE(hrw): extra repositories are added into image when they are needed as # separate files in /etc/apt/sources.list.d/ directory. For that purpose they diff --git a/docker/base/sources.list.ubuntu.aarch64 b/docker/base/sources.list.ubuntu.aarch64 index 263e728d3..81a5c7a4f 100644 --- a/docker/base/sources.list.ubuntu.aarch64 +++ b/docker/base/sources.list.ubuntu.aarch64 @@ -1,14 +1,14 @@ # Default repos -deb http://ports.ubuntu.com/ jammy main universe -deb http://ports.ubuntu.com/ jammy-updates main universe -deb http://ports.ubuntu.com/ jammy-security main universe +deb http://ports.ubuntu.com/ noble main universe +deb http://ports.ubuntu.com/ noble-updates main universe +deb http://ports.ubuntu.com/ noble-security main universe # Backports have a lower priority and must be explicitly installed to be used -deb http://ports.ubuntu.com/ jammy-backports main universe +deb http://ports.ubuntu.com/ noble-backports main universe # We need to add the repo for the updated packages they provide. The main ones # are qemu, libvirt, and openvswitch. -deb http://ubuntu-cloud.archive.canonical.com/ubuntu jammy-updates/caracal main +deb http://ubuntu-cloud.archive.canonical.com/ubuntu noble-updates/dalmatian main # NOTE(hrw): extra repositories are added into image when they are needed as # separate files in /etc/apt/sources.list.d/ directory. For that purpose they 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