Skip to content

Commit b24bf50

Browse files
mikalstillAlex-Welsh
authored andcommitted
Transition to the new rabbitmq Debian package archives.
RabbitMQ announced some time ago that the package archives were moving: https://www.rabbitmq.com/blog/2025/07/16/debian-apt-repositories-are-moving The old location is no longer working, so this patch transitions to the new one. Closes-Bug: #2131736 Change-Id: I6ef0ed9cc40be42a0d98c6a4c83c5c5c26d9cdbf Signed-off-by: Michael Still <mikal@stillhq.com>
1 parent 019dd69 commit b24bf50

File tree

4 files changed

+14
-7
lines changed

4 files changed

+14
-7
lines changed

docker/base/Dockerfile.j2

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
243243

244244
{% set base_apt_keys = [
245245
{'name': 'erlang-ppa', 'keyid': 'F77F1EDA57EBB1CC'},
246-
{'name': 'rabbitmq', 'keyid': '9F4587F226208342'},
246+
{'name': 'rabbitmq', 'keyid': '6B73A36E6026DFCA'},
247247
{'name': 'haproxy', 'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'},
248248
] %}
249249

kolla/template/repos.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,14 @@ debian:
5151
component: ""
5252
gpg_key: "proxysql.asc"
5353
rabbitmq:
54-
url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian"
54+
url: "https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm"
5555
suite: "bookworm"
5656
component: "main"
5757
gpg_key: "rabbitmq.gpg"
5858

5959
debian-aarch64:
6060
rabbitmq:
61-
url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian"
61+
url: "https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm"
6262
suite: "bookworm"
6363
component: "main"
6464
# NOTE(mnasiadka): Since rabbitmq is really noarch and community mirror is not
@@ -93,14 +93,14 @@ ubuntu:
9393
component: ""
9494
gpg_key: "proxysql.asc"
9595
rabbitmq:
96-
url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu"
96+
url: "https://deb1.rabbitmq.com/rabbitmq-server/ubuntu/noble"
9797
suite: "noble"
9898
component: "main"
9999
gpg_key: "rabbitmq.gpg"
100100

101101
ubuntu-aarch64:
102102
rabbitmq:
103-
url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu"
103+
url: "https://deb1.rabbitmq.com/rabbitmq-server/ubuntu/noble"
104104
suite: "noble"
105105
component: "main"
106106
# NOTE(mnasiadka): Since rabbitmq is really noarch and community mirror is not

kolla/tests/test_methods.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ def test_enable_repos_debian_arch(self):
191191
}
192192

193193
result = methods.handle_repos(template_vars, ["rabbitmq"], "enable")
194-
expectCmd = "RUN echo 'Uris: https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501
194+
expectCmd = "RUN echo 'Uris: https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm' " # noqa: E501
195195
expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && "
196196
expectCmd += "echo 'Components: main' "
197197
expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
@@ -236,7 +236,7 @@ def test_enable_repos_debian_multiple(self):
236236
expectCmd += ">>/etc/apt/sources.list.d/grafana.sources && "
237237

238238
expectCmd += "echo 'Uris: "
239-
expectCmd += "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501
239+
expectCmd += "https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm' " # noqa: E501
240240
expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && "
241241
expectCmd += "echo 'Components: main' "
242242
expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && "
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
fixes:
3+
- |
4+
`As announced in July 2025 <https://www.rabbitmq.com/blog/2025/07/16/debian-apt-repositories-are-moving>`__,
5+
the RabbitMQ project has changed the location and signing key for their Debian and
6+
Ubuntu packages. The repository configuration has been updated accordingly.
7+
`LP#2131736 <https://launchpad.net/bugs/2131736>`__

0 commit comments

Comments
 (0)