Synchronise master with upstream

README.rst

@@ -133,7 +133,7 @@ Kolla provides images to deploy the following infrastructure components:
   direct messaging back end for communication between services.
 - `RabbitMQ <https://www.rabbitmq.com/>`__ as a broker messaging back end for
   communication between services.
-- `Redis Sentinel <https://redis.io/topics/sentinel>`__ provides high availability for redis
+- `Valkey Sentinel <https://valkey.io/topics/sentinel>`__ provides high availability for valkey
   along with collateral tasks such as monitoring, notification and acts as configuration
   provider for clients.
 - `Telegraf <https://www.docs.influxdata.com/telegraf/>`__ as a plugin-driven server

doc/source/matrix_aarch64.csv

@@ -46,11 +46,11 @@ ovsdpdk,N,U,U
 placement,U,U,U
 prometheus,U,U,U
 rabbitmq,U,U,U
-redis,U,U,U
 skyline,U,U,U
 tacker,U,U,U
 telegraf,N,N,N
 tgtd,U,U,U
 trove,U,U,U
+valkey,U,U,U
 watcher,U,U,U
 zun,U,U,U

doc/source/matrix_x86.csv

@@ -47,12 +47,12 @@ ovsdpdk,N,U,U
 placement,T,T,T
 prometheus,U,U,U
 rabbitmq,T,T,T
-redis,T,U,U
 skyline,U,U,U
 swift,T,T,U
 tacker,T,U,U
 telegraf,U,U,U
 tgtd,N,T,U
 trove,U,U,U
+valkey,T,U,U
 watcher,U,U,U
 zun,T,T,U

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/manila/manila-share/Dockerfile.j2

@@ -8,10 +8,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 {% import "macros.j2" as macros with context %}
 
 {% if base_package_type == 'rpm' %}
-
-{# NOTE(mnasiadka): glusterfs-fuse missing in CentOS 10 Stream - temporarily from Kolla COPR #}
-{{ macros.enable_extra_repos(['ceph', 'epel', 'kolla_el10']) }}
-
     {% set manila_share_packages = [
         'ceph-common',
         'sqlite',

docker/mariadb-server/Dockerfile.j2

@@ -9,19 +9,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='mysql') }}
 
-{# NOTE(mnasiadka): Use AppStream version of MariaDB for now in CentOS #}
-
 {% if base_package_type == 'rpm' %}
 
 {# NOTE(mgoddard): EPEL required for pv package #}
-{{ macros.enable_extra_repos(['epel']) }}
+{{ macros.enable_extra_repos(['epel', 'mariadb']) }}
 
     {% set mariadb_packages = [
         'expect',
         'mariadb',
         'mariadb-backup',
         'mariadb-server',
-        'mariadb-server-galera',
         'pv',
         'rsync',
         'tar'
@@ -36,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/neutron/neutron-base/Dockerfile.j2

@@ -78,6 +78,7 @@ RUN chmod +x /usr/local/lib/neutron-wrappers/copy-wrappers \
     && chmod +x /usr/local/lib/neutron-wrappers/delete-wrappers
 
 RUN ln -s neutron-base-source/* neutron \
+    && {{ macros.upper_constraints_remove('networking-generic-switch') }} \
     && {{ macros.install_pip(neutron_base_pip_packages | customizable("pip_packages")) }} \
     && mkdir -p /etc/neutron \
     && cp -r /neutron/etc/* /etc/neutron/ \

docker/nova/nova-compute-ironic/Dockerfile.j2

@@ -7,7 +7,11 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{% set nova_compute_ironic_packages = ['xorriso', 'nvme-cli'] %}
+{% set nova_compute_ironic_packages = [
+    'genisoimage',
+    'nvme-cli',
+    'xorriso'
+] %}
 
 {{ macros.install_packages(nova_compute_ironic_packages | customizable("packages")) }}
 

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")) }}