aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2023-02-08 11:25:39 +0000
committerGerrit Code Review <review@openstack.org>2023-02-08 11:25:39 +0000
commit421fa62d0cf107244bacf44aacb6a3e1ef8024b6 (patch)
treeb546517e6d6169bf80e249ce053f4054e0c487c7
parentf3e5a90ca9d3185e8adbe9d60ff4aab19d1a2bf8 (diff)
parentd9f4c78e87c8567f10900614d893a6d03d6b0584 (diff)
downloadkolla-421fa62d0cf107244bacf44aacb6a3e1ef8024b6.tar.gz
kolla-421fa62d0cf107244bacf44aacb6a3e1ef8024b6.zip
Merge "rabbitmq: upgrade to 3.11"
-rw-r--r--docker/base/apt_preferences.debian2
-rw-r--r--docker/base/apt_preferences.ubuntu2
-rw-r--r--docker/kolla-toolbox/Dockerfile.j22
-rw-r--r--docker/rabbitmq/Dockerfile.j22
-rw-r--r--releasenotes/notes/rabbitmq-3-11-3b9ae3fc33ed4042.yaml4
5 files changed, 8 insertions, 4 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian
index 7b5d4631b..80670698c 100644
--- a/docker/base/apt_preferences.debian
+++ b/docker/base/apt_preferences.debian
@@ -1,5 +1,5 @@
Package: rabbitmq-server
-Pin: version 3.10.*
+Pin: version 3.11.*
Pin-Priority: 1000
Package: erlang*
diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu
index 8e6a9070f..81e651620 100644
--- a/docker/base/apt_preferences.ubuntu
+++ b/docker/base/apt_preferences.ubuntu
@@ -1,5 +1,5 @@
Package: rabbitmq-server
-Pin: version 3.10.*
+Pin: version 3.11.*
Pin-Priority: 1000
Package: erlang*
diff --git a/docker/kolla-toolbox/Dockerfile.j2 b/docker/kolla-toolbox/Dockerfile.j2
index 3f2e3737d..d5896add3 100644
--- a/docker/kolla-toolbox/Dockerfile.j2
+++ b/docker/kolla-toolbox/Dockerfile.j2
@@ -32,7 +32,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openssl-devel',
'openvswitch',
'python3-devel',
- 'rabbitmq-server-3.10.*'
+ 'rabbitmq-server-3.11.*'
] %}
{% elif base_package_type == 'deb' %}
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2
index 93d524551..c17cf0a19 100644
--- a/docker/rabbitmq/Dockerfile.j2
+++ b/docker/rabbitmq/Dockerfile.j2
@@ -16,7 +16,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set rabbitmq_packages = [
'erlang-25.*',
- 'rabbitmq-server-3.10.*'
+ 'rabbitmq-server-3.11.*'
] %}
{% elif base_package_type == 'deb' %}
diff --git a/releasenotes/notes/rabbitmq-3-11-3b9ae3fc33ed4042.yaml b/releasenotes/notes/rabbitmq-3-11-3b9ae3fc33ed4042.yaml
new file mode 100644
index 000000000..508403d2e
--- /dev/null
+++ b/releasenotes/notes/rabbitmq-3-11-3b9ae3fc33ed4042.yaml
@@ -0,0 +1,4 @@
+---
+upgrade:
+ - |
+ RabbitMQ version has been updated to 3.11.