Merge pull request #462 from stackhpc/upstream/master-2025-08-25

Synchronise master with upstream

Author: priteau

.zuul.d/base.yaml

@@ -53,13 +53,13 @@
     name: kolla-centos-10-stream
     nodes:
       - name: primary
-        label: nested-virt-centos-9-stream
+        label: centos-10-stream-8GB
 
 - nodeset:
     name: kolla-centos-10-stream-aarch64
     nodes:
       - name: primary
-        label: centos-9-stream-arm64
+        label: centos-10-stream-arm64-8GB
 
 - nodeset:
     name: kolla-rockylinux-9

doc/source/contributor/versions.rst

@@ -23,11 +23,11 @@ information about package sources.
  Galera         26.4 (LTS)         `MariaDB Community downloads`_
  OpenSearch     3.x                `OpenSearch install guide`_
  ProxySQL       2.7.x              `ProxySQL repository`_
- Rabbitmq       4.0.x              - CentOS/Rocky:
+ Rabbitmq       4.1.x              - CentOS/Rocky:
                                      `Team RabbitMQ 'Cloudsmith' repo (RPM)`_
                                    - Debian/Ubuntu:
                                      `Team RabbitMQ 'Cloudsmith' repo (Deb)`_
- Erlang         26.2.X             - CentOS/Rocky aarch64:
+ Erlang         27.X               - CentOS/Rocky aarch64:
                                      `openstack-kolla COPR`_
                                    - CentOS/Rocky x86-64:
                                      `Team RabbitMQ 'Cloudsmith' repo (RPM)`_

docker/base/influxdb.repo

@@ -1,7 +1,6 @@
 [influxdb]
 name = InfluxDB Repository - RHEL $releasever
-# NOTE(mnasiadka): Use EL9 for now, 10 is not available yet
-baseurl = https://repos.influxdata.com/rhel/9/$basearch/stable
+baseurl = https://repos.influxdata.com/stable/$basearch/main
 enabled = 0
 gpgcheck = 1
-gpgkey = https://repos.influxdata.com/influxdata-archive_compat.key
+gpgkey = https://repos.influxdata.com/influxdata-archive.key

kolla/common/config.py

@@ -37,7 +37,7 @@
     'rocky': 'Rocky Linux 9.* (Blue Onyx)',
     'ubuntu': 'Ubuntu 24.04.* LTS',
 }
-OPENSTACK_RELEASE = '2025.1'
+OPENSTACK_RELEASE = 'master'
 
 # This is noarch repository so we will use it on all architectures
 DELOREAN_DEPS = "https://trunk.rdoproject.org/centos10-master/" \

kolla/image/unbuildable.py

@@ -17,7 +17,6 @@
 UNBUILDABLE_IMAGES = {
     'aarch64': {
         "bifrost-base",        # someone need to get upstream working first
-        "prometheus-mtail",    # no aarch64 binary
     },
 
     # Issues for SHA1 keys:
@@ -49,10 +48,8 @@
     },
 
     'ubuntu+aarch64': {
-        "barbican-base",  # https://github.com/unbit/uwsgi/issues/2434
     },
 
     'centos+aarch64': {
-        "telegraf",      # no binary package
     },
 }