Synchronise master with upstream

doc/source/support_matrix.rst

@@ -18,7 +18,7 @@ The following base container images are supported:
 Distribution       Default base                    Default base tag
 ================== =============================== ================
 Rocky Linux        quay.io/rockylinux/rockylinux   10
-Debian Bookworm    debian                          bookworm
+Debian Trixie      debian                          trixie
 Ubuntu Noble       ubuntu                          24.04
 ================== =============================== ================
 

docker/base/Dockerfile.j2

@@ -187,12 +187,12 @@ RUN cat /tmp/kolla_bashrc >> /etc/bash.bashrc \
     && sed -i -e s/#*LAST_SYSTEM_UID=999/LAST_SYSTEM_UID=59999/g \
               -e s/#*LAST_SYSTEM_GID=999/LAST_SYSTEM_GID=59999/g /etc/adduser.conf
 
+{# NOTE(mnasiadka): Ubuntu arm64 uses ports.ubuntu.com #}
 {% 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/{{ base_distro }}.sources
-COPY sources.list.{{ base_distro }} /etc/apt/sources.list
+{% if base_distro == "ubuntu" and base_arch == 'aarch64' %}
+COPY {{ base_distro }}.sources.arm64 /etc/apt/sources.list.d/{{ base_distro }}.sources
 {% else %}
-COPY sources.list.{{ base_distro }}.{{ base_arch }} /etc/apt/sources.list
+COPY {{ base_distro }}.sources /etc/apt/sources.list.d/
 {% endif %}
 COPY sources.list /etc/apt/sources.list.d/kolla-custom.list
 {% endblock %}

docker/base/apt_preferences.debian

@@ -1,4 +1,4 @@
 # NOTE(hrw): we do not want backports unless requested
 Package: *
-Pin: release n=bookworm-backports
+Pin: release n=trixie-backports
 Pin-Priority: -1000

docker/base/debian.sources

@@ -0,0 +1,13 @@
+Types: deb
+# http://snapshot.debian.org/archive/debian/20251020T000000Z
+URIs: http://deb.debian.org/debian
+Suites: trixie trixie-updates trixie-backports
+Components: main
+Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
+
+Types: deb
+# http://snapshot.debian.org/archive/debian-security/20251020T000000Z
+URIs: http://deb.debian.org/debian-security
+Suites: trixie-security
+Components: main
+Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg

docker/base/ubuntu.sources

@@ -0,0 +1,24 @@
+Types: deb
+URIs: http://archive.ubuntu.com/ubuntu/
+Suites: noble noble-updates noble-backports
+Components: main universe
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+
+## Ubuntu security updates. Aside from URIs and Suites,
+## this should mirror your choices in the previous section.
+Types: deb
+URIs: http://security.ubuntu.com/ubuntu/
+Suites: noble-security
+Components: main universe
+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
+Components: main
+Signed-By: /usr/share/keyrings/ubuntu-cloud-keyring.gpg
+
+# 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
+# are defined in kolla/template/repos.yaml file.

docker/base/ubuntu.sources.arm64

@@ -0,0 +1,24 @@
+Types: deb
+URIs: http://ports.ubuntu.com/ubuntu-ports/
+Suites: noble noble-updates noble-backports
+Components: main universe
+Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
+
+## Ubuntu security updates. Aside from URIs and Suites,
+## this should mirror your choices in the previous section.
+Types: deb
+URIs: http://ports.ubuntu.com/ubuntu-ports/
+Suites: noble-security
+Components: main universe
+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
+Components: main
+Signed-By: /usr/share/keyrings/ubuntu-cloud-keyring.gpg
+
+# 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
+# are defined in kolla/template/repos.yaml file.

docker/httpd/Dockerfile.j2

@@ -22,8 +22,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'apache2',
         'ca-certificates',
         'libapache2-mod-auth-mellon',
-        'libapache2-mod-auth-openidc',
-        'libapache2-mod-proxy-uwsgi'
+        'libapache2-mod-auth-openidc'
     ] %}
 {% endif %}
 

docker/kolla-toolbox/Dockerfile.j2

@@ -96,7 +96,7 @@ RUN mkdir -p /requirements \
 ENV PATH {{ venv_path }}/bin:$PATH
 
 {% set kolla_toolbox_pip_packages = [
-        'ansible-core==2.19.*',
+        'ansible-core==2.20.*',
         'cmd2',
         'influxdb',
         'openstacksdk',

docker/mariadb-server/Dockerfile.j2

@@ -33,7 +33,10 @@ RUN ln -s /usr/lib64/galera-4 /usr/lib64/galera
         'expect',
         'mariadb-backup',
         'mariadb-client',
-        'mariadb-server'
+        'mariadb-server',
+        'pv',
+        'rsync',
+        'tar'
     ] %}
 {% endif %}
 

docker/openstack-base/Dockerfile.j2

@@ -44,7 +44,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
         'git',
         'libapache2-mod-wsgi-py3',
         'libffi-dev',
-        'libpcre3-dev',
+        'libpcre2-dev',
         'libpq-dev',
         'libssl-dev',
         'libxml2-dev',

docker/valkey/valkey-sentinel/Dockerfile.j2

@@ -11,11 +11,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {{ macros.enable_extra_repos(['epel']) }}
     {% set valkey_sentinel_packages = ['valkey'] %}
 {% elif base_package_type == 'deb' %}
-    {% if base_distro == 'debian' %}
-        {% set valkey_sentinel_packages = ['valkey-sentinel/bookworm-backports'] %}
-    {% else %}
-        {% set valkey_sentinel_packages = ['valkey-sentinel'] %}
-    {% endif %}
+    {% set valkey_sentinel_packages = ['valkey-sentinel'] %}
 {% endif %}
 {{ macros.install_packages(valkey_sentinel_packages | customizable("packages")) }}
 

docker/valkey/valkey-server/Dockerfile.j2

@@ -9,14 +9,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% if base_package_type == 'rpm' %}
 {{ macros.enable_extra_repos(['epel']) }}
-    {% set valkey_server_packages = ['valkey'] %}
-{% elif base_package_type == 'deb' %}
-    {% if base_distro == 'debian' %}
-        {% set valkey_server_packages = ['valkey/bookworm-backports'] %}
-    {% else %}
-        {% set valkey_server_packages = ['valkey'] %}
-    {% endif %}
 {% endif %}
+
+{% set valkey_server_packages = ['valkey'] %}
+
 {{ macros.install_packages(valkey_server_packages | customizable("packages")) }}
 
 {{ macros.kolla_patch_sources() }}

kolla/common/config.py

@@ -26,22 +26,21 @@
 DEBIAN_ARCH = ['amd64', 'arm64']
 DEFAULT_BASE_TAGS = {
     'centos': {'name': 'quay.io/centos/centos', 'tag': 'stream10'},
-    'debian': {'name': 'debian', 'tag': 'bookworm'},
+    'debian': {'name': 'debian', 'tag': 'trixie'},
     'rocky': {'name': 'quay.io/rockylinux/rockylinux', 'tag': '10'},
     'ubuntu': {'name': 'ubuntu', 'tag': '24.04'},
 }
 # NOTE(hrw): has to match PRETTY_NAME in /etc/os-release
 DISTRO_PRETTY_NAME = {
     'centos': 'CentOS Stream 10',
-    'debian': 'Debian GNU/Linux 12 (bookworm)',
+    'debian': 'Debian GNU/Linux 13 (trixie)',
     'rocky': 'Rocky Linux 10.* (Red Quartz)',
     'ubuntu': 'Ubuntu 24.04.* LTS',
 }
 
 OPENSTACK_RELEASE = 'master'
-# NOTE(mnasiadka): Using Epoxy here, since Debian OpenStack builds Flamingo
-#                  only for Trixie
-OPENSTACK_RELEASE_CODENAME = 'Epoxy'
+# NOTE(mnasiadka): Using Flamingo here until Gazpacho shows up in osbpo
+OPENSTACK_RELEASE_CODENAME = 'Flamingo'
 
 # TODO(mandre) check for file integrity instead of downloading from an HTTPS
 # source

kolla/image/unbuildable.py

@@ -31,8 +31,6 @@
     },
 
     'debian': {
-        "openvswitch-netcontrold",
-        # https://bugs.launchpad.net/kolla/+bug/2027668
     },
 
     'rocky': {

kolla/template/repos.yaml

@@ -27,39 +27,40 @@ deb:
 debian:
   erlang:
     url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
-    suite: "jammy"
+    suite: "noble"
     component: "main"
     gpg_key: "erlang-ppa.gpg"
   docker-ce:
     url: "https://download.docker.com/linux/debian"
-    suite: "bookworm"
+    suite: "trixie"
     component: "stable"
     gpg_key: "docker-ce.asc"
   fluentd:
-    url: "https://fluentd.cdn.cncf.io/lts/6/debian/bookworm"
-    suite: "bookworm"
+    url: "https://fluentd.cdn.cncf.io/lts/6/debian/trixie"
+    suite: "trixie"
     component: "contrib"
     gpg_key: "fluentd.asc"
+  # NOTE(mnasiadka): 11.4 does not have trixie builds yet
   mariadb:
     url: "https://dlm.mariadb.com/repo/mariadb-server/11.4/repo/debian"
     suite: "bookworm"
     component: "main"
     gpg_key: "mariadb.gpg"
   proxysql:
-    url: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/bookworm/"
+    url: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/trixie/"
     suite: "./"
     component: ""
     gpg_key: "proxysql.asc"
   rabbitmq:
-    url: "https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm"
-    suite: "bookworm"
+    url: "https://deb1.rabbitmq.com/rabbitmq-server/debian/trixie/"
+    suite: "trixie"
     component: "main"
     gpg_key: "rabbitmq.gpg"
 
 debian-aarch64:
   rabbitmq:
-    url: "https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm"
-    suite: "bookworm"
+    url: "https://deb1.rabbitmq.com/rabbitmq-server/debian/trixie"
+    suite: "trixie"
     component: "main"
     # NOTE(mnasiadka): Since rabbitmq is really noarch and community mirror is not
     # syncing binary-aarch64 - we're using amd64 here.

kolla/tests/test_methods.py

@@ -191,13 +191,13 @@ def test_enable_repos_debian_arch(self):
         }
 
         result = methods.handle_repos(template_vars, ["rabbitmq"], "enable")
-        expectCmd = "RUN echo 'Uris: https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm' "  # noqa: E501
+        expectCmd = "RUN echo 'Uris: https://deb1.rabbitmq.com/rabbitmq-server/debian/trixie' "  # noqa: E501
         expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Components: main' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Types: deb' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
-        expectCmd += "echo 'Suites: bookworm' "
+        expectCmd += "echo 'Suites: trixie' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Signed-By: /etc/kolla/apt-keys/rabbitmq.gpg' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
@@ -236,13 +236,13 @@ def test_enable_repos_debian_multiple(self):
         expectCmd += ">>/etc/apt/sources.list.d/grafana.sources && "
 
         expectCmd += "echo 'Uris: "
-        expectCmd += "https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm' "  # noqa: E501
+        expectCmd += "https://deb1.rabbitmq.com/rabbitmq-server/debian/trixie/' "  # noqa: E501
         expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Components: main' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Types: deb' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
-        expectCmd += "echo 'Suites: bookworm' "
+        expectCmd += "echo 'Suites: trixie' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
         expectCmd += "echo 'Signed-By: /etc/kolla/apt-keys/rabbitmq.gpg' "
         expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources"

releasenotes/notes/ansible-core-2-20-bd912e1767d5f197.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Version of ``ansible-core`` in ``kolla-toolbox`` has been updated to
+    ``2.20``.

releasenotes/notes/deb822-3f0435dfce6da841.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    ``base`` container image sources.list for Debian and Ubuntu have been
+    reworked to use ``deb822`` and now are called ``debian.sources`` and
+    ``ubuntu.sources``.

releasenotes/notes/debian-trixie-23987480043dc662.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Debian ``trixie`` is now used instead of ``bookworm``. Trixie is the current
+    stable release of Debian.

setup.cfg

@@ -6,7 +6,7 @@ description_file =
 author = OpenStack
 author_email = openstack-discuss@lists.openstack.org
 home_page = https://docs.openstack.org/kolla/latest/
-python_requires = >=3.8
+python_requires = >=3.10
 license = Apache License, Version 2.0
 classifier =
     Environment :: OpenStack
@@ -18,11 +18,10 @@ classifier =
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.8
-    Programming Language :: Python :: 3.9
     Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3.11
     Programming Language :: Python :: 3.12
+    Programming Language :: Python :: 3.13
 
 [files]
 packages =