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

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'

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/ \

kolla/common/config.py

@@ -38,7 +38,7 @@
     'ubuntu': 'Ubuntu 24.04.* LTS',
 }
 
-OPENSTACK_RELEASE = '2025.2'
+OPENSTACK_RELEASE = 'master'
 # NOTE(mnasiadka): Using Epoxy here, since Debian OpenStack builds Flamingo
 #                  only for Trixie
 OPENSTACK_RELEASE_CODENAME = 'Epoxy'
@@ -64,9 +64,9 @@
                     'openvswitch',
                     'proxysql',
                     'rabbitmq',
-                    'redis',
                     'storm',
                     'tgtd',
+                    'valkey',
                 ],
                 help='Infra images'),
     cfg.ListOpt('main',
@@ -99,10 +99,10 @@
                     'masakari',
                     'mistral',
                     'octavia',
-                    'redis',
                     'tacker',
                     'telegraf',
                     'trove',
+                    'valkey',
                     'zookeeper',
                     'zun',
                 ],

kolla/common/users.py

@@ -217,7 +217,7 @@
         'uid': 42459,
         'gid': 42459,
     },
-    'redis-user': {
+    'redis-user': {  # unused user (redis dropped)
         'uid': 42460,
         'gid': 42460,
     },

kolla/image/unbuildable.py

@@ -26,7 +26,6 @@
         "hacluster-pcs",         # Missing crmsh package
         "nova-spicehtml5proxy",  # Missing spicehtml5 package
         "ovsdpdk",               # Not supported on CentOS
-        "redis-base",            # Missing in CS10
         "telegraf",              # CS10 no opstools repo
         "tgtd",                  # Not supported on CentOS
     },
@@ -41,7 +40,6 @@
         "hacluster-pcs",         # Missing crmsh package
         "nova-spicehtml5proxy",  # Missing spicehtml5 package
         "ovsdpdk",               # Not supported on CentOS
-        "redis-base",            # Missing in Rocky10
         "telegraf",              # CS10 no opstools repo
         "tgtd",                  # Not supported on CentOS
     },

releasenotes/notes/drop-redis-d286ca1237747c48.yaml

@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    ``redis`` container image has been dropped due to migration to ``valkey``.