From bd501c51db412ba238aba5a2195a9827c9348c4b Mon Sep 17 00:00:00 2001 From: Michael Still Date: Tue, 18 Nov 2025 19:45:29 +1100 Subject: [PATCH] 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 (cherry picked from commit 0fc73a644bdb7e4f583ba5ebf7ee3fcd60fb8ffc) --- docker/base/Dockerfile.j2 | 2 +- kolla/template/repos.yaml | 8 ++++---- kolla/tests/test_methods.py | 6 +++--- ...recated-rabbitmq-package-archive-47548e7a41baa68b.yaml | 7 +++++++ 4 files changed, 15 insertions(+), 8 deletions(-) create mode 100644 releasenotes/notes/handle-deprecated-rabbitmq-package-archive-47548e7a41baa68b.yaml diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 5aec1d230a..6ac28ba853 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -288,7 +288,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom {% set base_apt_keys = [ {'name': 'erlang-ppa', 'keyid': 'F77F1EDA57EBB1CC'}, - {'name': 'rabbitmq', 'keyid': '9F4587F226208342'}, + {'name': 'rabbitmq', 'keyid': '6B73A36E6026DFCA'}, {'name': 'haproxy', 'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'}, ] %} diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index efeedd5e2d..607396edf4 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -93,7 +93,7 @@ debian: component: "" gpg_key: "proxysql.asc" rabbitmq: - url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian" + url: "https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm" suite: "bookworm" component: "main" gpg_key: "rabbitmq.gpg" @@ -150,7 +150,7 @@ debian-aarch64: component: "" gpg_key: "proxysql.asc" rabbitmq: - url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian" + url: "https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm" suite: "bookworm" component: "main" # NOTE(mnasiadka): Since rabbitmq is really noarch and community mirror is not @@ -250,7 +250,7 @@ ubuntu: component: "" gpg_key: "proxysql.asc" rabbitmq: - url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu" + url: "https://deb1.rabbitmq.com/rabbitmq-server/ubuntu/noble" suite: "noble" component: "main" gpg_key: "rabbitmq.gpg" @@ -308,7 +308,7 @@ ubuntu-aarch64: component: "" gpg_key: "proxysql.asc" rabbitmq: - url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu" + url: "https://deb1.rabbitmq.com/rabbitmq-server/ubuntu/noble" suite: "noble" component: "main" arch: "amd64" diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py index afa21e2ab2..e55bc2a537 100644 --- a/kolla/tests/test_methods.py +++ b/kolla/tests/test_methods.py @@ -85,8 +85,8 @@ class MethodsTest(base.TestCase): 'base_package_type': 'deb' } - result = methods.handle_repos(template_vars, ['rabbitmq'], 'enable') - expectCmd = "RUN echo 'Uris: https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501 + result = methods.handle_repos(template_vars, ["rabbitmq"], "enable") + expectCmd = "RUN echo 'Uris: https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm' " # noqa: E501 expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && " expectCmd += "echo 'Components: main' " expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && " @@ -133,7 +133,7 @@ class MethodsTest(base.TestCase): expectCmd += ">>/etc/apt/sources.list.d/grafana.sources && " expectCmd += "echo 'Uris: " - expectCmd += "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501 + expectCmd += "https://deb1.rabbitmq.com/rabbitmq-server/debian/bookworm' " # noqa: E501 expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && " expectCmd += "echo 'Components: main' " expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && " diff --git a/releasenotes/notes/handle-deprecated-rabbitmq-package-archive-47548e7a41baa68b.yaml b/releasenotes/notes/handle-deprecated-rabbitmq-package-archive-47548e7a41baa68b.yaml new file mode 100644 index 0000000000..b24cc3cdc0 --- /dev/null +++ b/releasenotes/notes/handle-deprecated-rabbitmq-package-archive-47548e7a41baa68b.yaml @@ -0,0 +1,7 @@ +--- +fixes: + - | + `As announced in July 2025 `__, + the RabbitMQ project has changed the location and signing key for their Debian and + Ubuntu packages. The repository configuration has been updated accordingly. + `LP#2131736 `__