Merge "[base] Ensure full control over APT sources for Ubuntu" into stable/2025.1

Author: Zuul

docker/base/Dockerfile.j2

@@ -249,7 +249,7 @@ RUN cat /tmp/kolla_bashrc >> /etc/bash.bashrc \
 
 {% block base_ubuntu_package_sources_list %}
 {% if base_distro == 'debian' or ( base_distro == 'ubuntu' and base_arch == 'x86_64' ) %}
-RUN rm -f /etc/apt/sources.list.d/debian.sources
+RUN rm -f /etc/apt/sources.list.d/{{ base_distro }}.sources
 COPY sources.list.{{ base_distro }} /etc/apt/sources.list
 {% else %}
 COPY sources.list.{{ base_distro }}.{{ base_arch }} /etc/apt/sources.list

docker/base/sources.list.ubuntu

@@ -3,11 +3,9 @@
 # Default repos
 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-backports 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/ 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 noble-updates/epoxy main

releasenotes/notes/bug-2112140-41a1924c260e531c.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Ensures Kolla uses only configured APT mirror on Ubuntu for full source control.
+    `LP#2112140 <https://launchpad.net/bugs/2112140>`__