openstack/kolla
Code Issues Proposed changes

Merge "rabbitmq: bump version to 3.12"

Browse Source
This commit is contained in:
Zuul 2023-08-17 08:35:02 +00:00 committed by Gerrit Code Review
commit a004abbdc3
9 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/apt_preferences.debian
View File

@ -1,5 +1,5 @@
Package: rabbitmq-server
Pin: version 3.11.*
Pin: version 3.12.*
Pin-Priority: 1000
# NOTE(hrw): we do not want backports unless requested

2
docker/base/apt_preferences.ubuntu
View File

@ -1,5 +1,5 @@
Package: rabbitmq-server
Pin: version 3.11.*
Pin: version 3.12.*
Pin-Priority: 1000
Package: *

4
docker/base/hrw-copr-erlang-for-rabbitmq.repo
View File

@ -4,8 +4,8 @@
[copr-hrw-erlang-for-rabbitmq]
name=Hrw's COPR with Erlang build for RabbitMQ
baseurl=https://download.copr.fedorainfracloud.org/results/hrw/erlang-25-for-rabbitmq/centos-stream-$releasever-$basearch/
baseurl=https://download.copr.fedorainfracloud.org/results/hrw/erlang-for-rabbitmq/centos-stream-$releasever-$basearch/
gpgcheck=1
enabled=0
gpgkey=https://download.copr.fedorainfracloud.org/results/hrw/erlang-25-for-rabbitmq/pubkey.gpg
gpgkey=https://download.copr.fedorainfracloud.org/results/hrw/erlang-for-rabbitmq/pubkey.gpg
repo_gpgcheck=0

3
docker/base/rabbitmq_rabbitmq-erlang.repo
View File

@ -1,7 +1,6 @@
[rabbitmq_rabbitmq-erlang]
name=rabbitmq_rabbitmq-erlang
# https://www.rabbitmq.com/install-rpm.html lists "el/8" for CentOS Stream 9
baseurl=https://packagecloud.io/rabbitmq/erlang/el/8/$basearch
baseurl=https://packagecloud.io/rabbitmq/erlang/el/9/$basearch
gpgcheck=1
enabled=0
gpgkey = https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc

2
docker/base/rabbitmq_rabbitmq-server.repo
View File

@ -1,6 +1,6 @@
[rabbitmq_rabbitmq-server]
name=rabbitmq_rabbitmq-server
baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/8/$basearch
baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/9/$basearch
gpgcheck=1
enabled=0
gpgkey = https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc

4
docker/kolla-toolbox/Dockerfile.j2
View File

@ -19,7 +19,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% set kolla_toolbox_packages = [
'crudini',
'erlang-25.*',
'erlang-26.*',
'gcc',
'gdisk',
'git',
@ -32,7 +32,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openssl-devel',
'openvswitch',
'python3-devel',
'rabbitmq-server-3.11.*'
'rabbitmq-server-3.12.*'
] %}
{% elif base_package_type == 'deb' %}

4
docker/rabbitmq/Dockerfile.j2
View File

@ -15,8 +15,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}
{% set rabbitmq_packages = [
'erlang-25.*',
'rabbitmq-server-3.11.*'
'erlang-26.*',
'rabbitmq-server-3.12.*'
] %}
{% elif base_package_type == 'deb' %}

8
kolla/template/repos.yaml
View File

@ -37,7 +37,7 @@ centos-aarch64:
debian:
erlang:
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
suite: "focal"
component: "main"
gpg_key: "erlang-ppa.gpg"
@ -84,7 +84,7 @@ debian:
debian-aarch64:
erlang:
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
suite: "focal"
component: "main"
gpg_key: "erlang-ppa.gpg"
@ -167,7 +167,7 @@ rocky-aarch64:
ubuntu:
erlang:
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
suite: "jammy"
component: "main"
gpg_key: "erlang-ppa.gpg"
@ -214,7 +214,7 @@ ubuntu:
ubuntu-aarch64:
erlang:
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
suite: "jammy"
component: "main"
gpg_key: "erlang-ppa.gpg"

4
releasenotes/notes/rabbitmq-3.12-erlang-26-e5917a1f460b45f8.yaml Normal file
View File

@ -0,0 +1,4 @@
---
upgrade:
- |
RabbitMQ version has been updated to ``3.12`` and Erlang to ``26``.