From 3971fe000c45fc0c207ee8e2d4a738efec137327 Mon Sep 17 00:00:00 2001 From: OpenStack Release Bot Date: Mon, 24 Nov 2025 16:16:02 +0000 Subject: [PATCH 1/3] Update .gitreview for unmaintained/2024.1 Change-Id: Ifb714ef610830a8981744ff4f4cd76dcb2742d9b Signed-off-by: OpenStack Release Bot Generated-By: openstack/project-config:roles/copy-release-tools-scripts/files/release-tools/functions --- .gitreview | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitreview b/.gitreview index 25a627397f..fa4a74a2f1 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=review.opendev.org port=29418 project=openstack/kolla.git -defaultbranch=stable/2024.1 +defaultbranch=unmaintained/2024.1 From d7de9c7a5c6df484258a17c92fefbc530d0e9eec Mon Sep 17 00:00:00 2001 From: Michael Still Date: Tue, 18 Nov 2025 19:45:29 +1100 Subject: [PATCH 2/3] 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) (cherry picked from commit 57f438d69362b28d03f190fa6046843c9578c8c1) --- docker/base/Dockerfile.j2 | 2 +- kolla/template/repos-noble.yaml | 4 ++-- kolla/template/repos.yaml | 8 ++++---- kolla/tests/test_methods.py | 6 +++--- ...recated-rabbitmq-package-archive-47548e7a41baa68b.yaml | 7 +++++++ 5 files changed, 17 insertions(+), 10 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 8b7d044116..674ed91ab3 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -301,7 +301,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-noble.yaml b/kolla/template/repos-noble.yaml index 584e724b38..6078190158 100644 --- a/kolla/template/repos-noble.yaml +++ b/kolla/template/repos-noble.yaml @@ -47,7 +47,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" @@ -100,7 +100,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/template/repos.yaml b/kolla/template/repos.yaml index b434a53b8f..6c1c1bd6b6 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -86,7 +86,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" @@ -138,7 +138,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 @@ -230,7 +230,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/jammy" suite: "jammy" component: "main" gpg_key: "rabbitmq.gpg" @@ -282,7 +282,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/jammy" suite: "jammy" 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 @@ def test_enable_repos_debian_arch(self): '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 @@ def test_enable_repos_debian_multiple(self): 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 `__ From 0934ca60d0e68d166daf26348e5f3c0460788051 Mon Sep 17 00:00:00 2001 From: Rafal Lewandowski Date: Wed, 10 Dec 2025 15:12:17 +0100 Subject: [PATCH 3/3] [unmaintained/2024.1 only] Fix the tarballs pointer Closes-Bug: #2134456 Change-Id: I68e6766a794ed25878c85e88f33722578184d141 Signed-off-by: Rafal Lewandowski --- kolla/common/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kolla/common/config.py b/kolla/common/config.py index f04177b2b5..1b475d3899 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -381,7 +381,7 @@ def parse(conf, args, usage=None, prog=None, # NOTE(jeffrey4l): set the default base tag based on the # base option conf.set_default('base_tag', DEFAULT_BASE_TAGS[conf.base]['tag']) - prefix = '' if conf.openstack_release == 'master' else 'stable-' + prefix = '' if conf.openstack_release == 'master' else 'unmaintained-' openstack_branch = '{}{}'.format(prefix, conf.openstack_release) openstack_branch_slashed = openstack_branch.replace('-', '/') conf.set_default('openstack_branch', openstack_branch)