Synchronise master with upstream

docker/base/ubuntu.sources

@@ -15,7 +15,7 @@ Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
 ## Ubuntu Cloud Archive
 Types: deb
 URIs: http://ubuntu-cloud.archive.canonical.com/ubuntu
-Suites: noble-updates/flamingo
+Suites: noble-updates/gazpacho
 Components: main
 Signed-By: /usr/share/keyrings/ubuntu-cloud-keyring.gpg
 

docker/base/ubuntu.sources.arm64

@@ -15,7 +15,7 @@ Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
 ## Ubuntu Cloud Archive
 Types: deb
 URIs: http://ubuntu-cloud.archive.canonical.com/ubuntu
-Suites: noble-updates/flamingo
+Suites: noble-updates/gazpacho
 Components: main
 Signed-By: /usr/share/keyrings/ubuntu-cloud-keyring.gpg
 

docker/bifrost/bifrost-base/Dockerfile.j2

@@ -19,11 +19,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {# NOTE(mgoddard): EPEL required for nginx #}
 {{ macros.enable_extra_repos(['epel']) }}
-
-    {% set bifrost_base_packages = bifrost_base_packages + [
-        'python3.12',
-        'python3.12-devel'
-    ] %}
 {% endif %}
 
 {{ macros.install_packages(bifrost_base_packages | customizable("packages")) }}

docker/horizon/Dockerfile.j2

@@ -49,10 +49,13 @@ COPY extend_start.sh /usr/local/bin/kolla_extend_start
 # NOTE(kevko): This dance with local settings python paths below is needed
 # because we are using different distros with different python version and we need to
 # know to which path symlink should point to.
-# NOTE(mnasiadka): pinning setuptools due to https://bugs.launchpad.net/horizon/+bug/2007574
+# NOTE(bbezak): pin setuptools for pip build isolation due to
+# https://bugs.launchpad.net/horizon/+bug/2141293
 RUN ln -s horizon-source/* horizon \
     && {{ macros.upper_constraints_remove("horizon") }} \
-    && {{ macros.install_pip(horizon_pip_packages | customizable("pip_packages")) }} \
+    && echo "setuptools<82" > /tmp/horizon-build-constraints.txt \
+    && PIP_BUILD_CONSTRAINT=/tmp/horizon-build-constraints.txt \
+       {{ macros.install_pip(horizon_pip_packages | customizable("pip_packages")) }} \
     && mkdir -p /etc/openstack-dashboard \
     && cp -r /horizon/openstack_dashboard/conf/* /etc/openstack-dashboard/ \
     && cp /horizon/openstack_dashboard/local/local_settings.py.example /etc/openstack-dashboard/local_settings.py \

docker/kolla-toolbox/Dockerfile.j2

@@ -61,24 +61,6 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq
 {% endif %}
 {{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }}
 
-{# NOTE(kevko):
-  In all distros, there is always a /usr/bin/python3 -> python3.X.
-  However, this is disrupted for RHEL-based systems because, unlike
-  other distros, we upgrade Python above [1], but we forget to set
-  the default python3 to the new python3.X. As a result also, everything
-  outside of the virtual environment ends up running on Python 3.9.
-
-  So, let's correctly set python3 -> python3.X since we had to install
-  it and now have default python3 points to the new version.
-
-  [1] https://review.opendev.org/c/openstack/kolla/+/924245
-#}
-{% if base_package_type == 'rpm' %}
-RUN cd /usr/bin && \
-    rm -f python3 && \
-    ln -s python3.12 python3
-{% endif %}
-
 {% block kolla_toolbox_pip_conf %}
 ENV UPPER_CONSTRAINTS_FILE=https://releases.openstack.org/constraints/upper/{{ openstack_release }}
 {% endblock %}

docker/openstack-base/Dockerfile.j2

@@ -174,10 +174,9 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'simplegeneric',
         'simplejson',
         'six',
-        'sqlalchemy-migrate',
         'sqlparse',
         'stevedore',
-        'tooz[consul,etcd,etcd3gw,zake,redis,postgresql,mysql,zookeeper,memcached,ipc]',
+        'tooz[consul,etcd,etcd3gw,redis,postgresql,mysql,zookeeper,memcached,ipc]',
         'unicodecsv',
         'uwsgi',
         'warlock',