Merge pull request #402 from stackhpc/upstream/master-2025-04-14

Alex-Welsh · web-flow · commit 441a8c7cd661 · 2025-04-14T09:36:35.000+01:00
diff --git a/doc/source/contributor/versions.rst b/doc/source/contributor/versions.rst
@@ -23,7 +23,7 @@ information about package sources.
  Galera         26.4 (LTS)         `MariaDB Community downloads`_
  OpenSearch     2.x                `OpenSearch install guide`_
  ProxySQL       2.7.x              `ProxySQL repository`_
- Rabbitmq       3.13.x             - CentOS/Rocky:
+ Rabbitmq       4.0.x              - CentOS/Rocky:
                                      `Team RabbitMQ 'Cloudsmith' repo (RPM)`_
                                    - Debian/Ubuntu:
                                      `Team RabbitMQ 'Cloudsmith' repo (Deb)`_
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
@@ -38,7 +38,7 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq
         'openvswitch',
         'python3.12',
         'python3.12-devel',
-        'rabbitmq-server-3.13.*'
+        'rabbitmq-server-4.0.*'
     ] %}
 
 {% elif base_package_type == 'deb' %}
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
@@ -22,7 +22,7 @@ COPY apt_preferences_rabbitmq.{{ base_distro }} /etc/apt/preferences.d/rabbitmq
 
     {% set rabbitmq_packages = [
         'erlang-26.2.*',
-        'rabbitmq-server-3.13.*'
+        'rabbitmq-server-4.0.*'
     ] %}
 
 {% 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 3.13.*
+Pin: version 4.0.*
 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 3.13.*
+Pin: version 4.0.*
 Pin-Priority: 1000
 
 Package: erlang
diff --git a/releasenotes/notes/rabbitmq-4-0-ee1a5f2ef212f6a6.yaml b/releasenotes/notes/rabbitmq-4-0-ee1a5f2ef212f6a6.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+  - |
+    ``RabbitMQ`` version has been upgraded to ``4.0``.

-Original file line number
+Diff line change
@@ @@ -0,0 +1,4 @@ @@
 +---
 +upgrade:
 +  - |
 +    ``RabbitMQ`` version has been upgraded to ``4.0``.