Merge pull request #523 from stackhpc/upstream/master-2026-03-30

Alex-Welsh · web-flow · commit 3031997ae296 · 2026-03-30T08:49:20.000+01:00
Synchronise master with upstream
diff --git a/README.rst b/README.rst
@@ -130,8 +130,6 @@ Kolla provides images to deploy the following infrastructure components:
 - `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
-  agent for collecting & reporting metrics.
 
 Directories
 ===========
diff --git a/doc/source/contributor/versions.rst b/doc/source/contributor/versions.rst
@@ -15,31 +15,26 @@ information about package sources.
 ==============  ================  =============================================
  Name           Version           Package source information
 ==============  ================  =============================================
- Grafana        9.x                `Grafana install guide`_
- Kibana         7.x                `Kibana install guide`_
- Logstash       7.x                `Logstash install guide`_
+ Grafana        12.x               `Grafana install guide`_
  MariaDB        11.4 (LTS)         `MariaDB Community downloads`_
  Galera         26.4 (LTS)         `MariaDB Community downloads`_
  OpenSearch     3.x                `OpenSearch install guide`_
  ProxySQL       3.0.x              `ProxySQL repository`_
- Rabbitmq       4.1.x              - CentOS/Rocky:
+ RabbitMQ       4.2.x              - CentOS/Rocky:
                                      `Team RabbitMQ 'Cloudsmith' repo (RPM)`_
                                    - Debian/Ubuntu:
                                      `Team RabbitMQ 'Cloudsmith' repo (Deb)`_
- Erlang         27.X               - CentOS/Rocky aarch64:
+ Erlang         27.x               - CentOS/Rocky aarch64:
                                      `openstack-kolla COPR`_
                                    - CentOS/Rocky x86-64:
                                      `Team RabbitMQ 'Cloudsmith' repo (RPM)`_
                                    - Debian/Ubuntu:
                                      `Team RabbitMQ 'Modern Erlang' PPA`_
  Fluentd        6.x (LTS)          `Fluentd install guide`_
- Telegraf       1.24.x             `InfluxDB upstream repo`_
 ==============  ================  =============================================
 
 .. _`InfluxDB upstream repo`: https://repos.influxdata.com/
 .. _`OpenSearch install guide`: https://opensearch.org/downloads.html
-.. _`Kibana install guide`: https://www.elastic.co/guide/en/kibana/7.10/install.html
-.. _`Logstash install guide`: https://www.elastic.co/guide/en/logstash/7.9/installing-logstash.html
 .. _`Fluentd install guide`: https://www.fluentd.org/download
 .. _`ProxySQL repository`: https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/
 
diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv
@@ -47,7 +47,6 @@ prometheus,U,U,U
 rabbitmq,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
diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv
@@ -49,7 +49,6 @@ rabbitmq,T,T,T
 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
diff --git a/docker/glance/glance-api/Dockerfile.j2 b/docker/glance/glance-api/Dockerfile.j2
@@ -11,13 +11,15 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
     {% set glance_api_packages = [
         'lsscsi',
         'device-mapper-multipath',
+        'nvme-cli',
         'qemu-img'
     ] %}
 {% elif base_package_type == 'deb' %}
     {% set glance_api_packages = [
         'lsscsi',
         'multipath-tools',
         'nfs-common',
+        'nvme-cli',
         'qemu-utils'
     ] %}
 {% endif %}
diff --git a/docker/horizon/Dockerfile.j2 b/docker/horizon/Dockerfile.j2
@@ -36,7 +36,8 @@ ADD horizon-archive /horizon-source
 ADD plugins-archive /
 
 {% set horizon_pip_packages = [
-    '/horizon'
+    '/horizon',
+    'django_redis'
 ] %}
 
 {% set horizon_plugins_pip_packages = [
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
@@ -40,7 +40,7 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq
         'openvswitch${KOLLA_RPM_OVS_VERSION}',
         'python3',
         'python3-devel',
-        'rabbitmq-server-4.1.*'
+        'rabbitmq-server-4.2.*'
     ] %}
 
 {% elif base_package_type == 'deb' %}
@@ -62,12 +62,16 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq
 {{ macros.install_packages(kolla_toolbox_packages | customizable("packages")) }}
 
 {% block kolla_toolbox_pip_conf %}
-ENV UPPER_CONSTRAINTS_FILE=https://releases.openstack.org/constraints/upper/{{ openstack_release }}
+ENV UPPER_CONSTRAINTS_FILE=/requirements/upper-constraints.txt
 {% endblock %}
 
 {% block kolla_toolbox_upper_constraints %}
-RUN mkdir -p /requirements \
-    && curl -o /requirements/upper-constraints.txt $UPPER_CONSTRAINTS_FILE \
+ADD kolla-toolbox-archive /kolla-toolbox-source
+
+RUN case "$UPPER_CONSTRAINTS_FILE" in \
+        http*) mkdir -p /requirements && curl -LO $UPPER_CONSTRAINTS_FILE /requirements/upper-constraints.txt ;; \
+        *)      ln -s kolla-toolbox-source/* /requirements ;; \
+    esac \
     && {{ macros.upper_constraints_remove("openstacksdk") }} \
     && python3 -m venv --system-site-packages {{ venv_path }} \
     && KOLLA_DISTRO_PYTHON_VERSION=$(/usr/bin/python3 -c "import sys; print('{}.{}'.format(sys.version_info.major, sys.version_info.minor))") \
@@ -79,6 +83,7 @@ ENV PATH {{ venv_path }}/bin:$PATH
 
 {% set kolla_toolbox_pip_packages = [
         'ansible-core==2.20.*',
+        'ansible-runner',
         'cmd2',
         'openstacksdk',
         'os-client-config',
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
@@ -24,7 +24,7 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq
 
     {% set rabbitmq_packages = [
         'erlang-27.*',
-        'rabbitmq-server-4.1.*'
+        'rabbitmq-server-4.2.*'
     ] %}
 
 {% elif base_package_type == 'deb' %}
diff --git a/docker/rabbitmq/apt_preferences_rabbitmq.debian b/docker/rabbitmq/apt_preferences_rabbitmq.debian
@@ -1,5 +1,5 @@
 Package: rabbitmq-server
-Pin: version 4.1.*
+Pin: version 4.2.*
 Pin-Priority: 1000
 
 Package: erlang*
diff --git a/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu b/docker/rabbitmq/apt_preferences_rabbitmq.ubuntu
@@ -1,5 +1,5 @@
 Package: rabbitmq-server
-Pin: version 4.1.*
+Pin: version 4.2.*
 Pin-Priority: 1000
 
 Package: erlang*
diff --git a/docker/telegraf/Dockerfile.j2 b/docker/telegraf/Dockerfile.j2
diff --git a/docker/telegraf/extend_start.sh b/docker/telegraf/extend_start.sh
diff --git a/docker/telegraf/telegraf_sudoers b/docker/telegraf/telegraf_sudoers
diff --git a/kolla/common/config.py b/kolla/common/config.py
@@ -38,9 +38,8 @@
     'ubuntu': 'Ubuntu 24.04.* LTS',
 }
 
-OPENSTACK_RELEASE = 'master'
-# NOTE(mnasiadka): Using Flamingo here until Gazpacho shows up in osbpo
-OPENSTACK_RELEASE_CODENAME = 'Flamingo'
+OPENSTACK_RELEASE = '2026.1'
+OPENSTACK_RELEASE_CODENAME = 'Gazpacho'
 
 # TODO(mandre) check for file integrity instead of downloading from an HTTPS
 # source
@@ -96,7 +95,6 @@
                     'mistral',
                     'octavia',
                     'tacker',
-                    'telegraf',
                     'trove',
                     'valkey',
                     'zun',
diff --git a/kolla/common/sources.py b/kolla/common/sources.py
@@ -156,6 +156,10 @@
         'type': 'url',
         'location': ('$tarballs_base/openstack/keystone/'
                      'keystone-${openstack_branch}.tar.gz')},
+    'kolla-toolbox': {
+        'type': 'url',
+        'location': ('$tarballs_base/openstack/requirements/'
+                     'requirements-${openstack_branch}.tar.gz')},
     'kuryr-base': {
         'type': 'url',
         'location': ('$tarballs_base/openstack/kuryr/'
diff --git a/kolla/common/users.py b/kolla/common/users.py
@@ -185,7 +185,7 @@
         'uid': 42447,
         'gid': 42447,
     },
-    'telegraf-user': {
+    'telegraf-user': {  # unused user (telegraf dropped)
         'uid': 42448,
         'gid': 42448,
     },
diff --git a/kolla/image/unbuildable.py b/kolla/image/unbuildable.py
@@ -26,7 +26,6 @@
         "hacluster-pcs",         # Missing crmsh package
         "nova-spicehtml5proxy",  # Missing spicehtml5 package
         "ovsdpdk",               # Not supported on CentOS
-        "telegraf",              # CS10 no opstools repo
         "tgtd",                  # Not supported on CentOS
     },
 
@@ -38,7 +37,6 @@
         "hacluster-pcs",         # Missing crmsh package
         "nova-spicehtml5proxy",  # Missing spicehtml5 package
         "ovsdpdk",               # Not supported on CentOS
-        "telegraf",              # CS10 no opstools repo
         "tgtd",                  # Not supported on CentOS
     },
 
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
@@ -175,7 +175,7 @@ rpm:
     distro: True
     name: "opstools"
   proxysql:
-    baseurl: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/almalinux/9"
+    baseurl: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/almalinux/10"
     gpgkey: "https://repo.proxysql.com/ProxySQL/proxysql-3.0.x/repo_pub_key"
     name: "proxysql"
   rabbitmq:
diff --git a/releasenotes/notes/bug-2035975-94c5670049a7e1a6.yaml b/releasenotes/notes/bug-2035975-94c5670049a7e1a6.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fix missing nvme-cli package in Glance container.
+    `LP#2035975 <https://launchpad.net/bugs/2035975>`__
diff --git a/releasenotes/notes/bug-2093414-12e2d0f21e34bc59.yaml b/releasenotes/notes/bug-2093414-12e2d0f21e34bc59.yaml
@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Adds the ``django-redis`` package to the Horizon image.
+    This enables using Redis or Valkey as a Django cache and
+    session backend.
+    `LP#2093414 <https://launchpad.net/bugs/2093414>`__
diff --git a/releasenotes/notes/drop-telegraf-28dd961f18ed7825.yaml b/releasenotes/notes/drop-telegraf-28dd961f18ed7825.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    Support for building ``telegraf`` container images has been dropped.
diff --git a/releasenotes/notes/rabbitmq-42-84cf0d09c9f33ef4.yaml b/releasenotes/notes/rabbitmq-42-84cf0d09c9f33ef4.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    ``rabbitmq`` version has been updated to ``4.2``.
diff --git a/releasenotes/notes/switch-proxysql3-base-to-almalinux10-d64c97ba1a894a34.yaml b/releasenotes/notes/switch-proxysql3-base-to-almalinux10-d64c97ba1a894a34.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    Bumped ProxySQL 3.0.x repository to Almalinux 10 for Redhat family
+    distributions.
