From 528b7eef167996041f7cd3b2184fbcd6b5ff57fb Mon Sep 17 00:00:00 2001 From: Matt Crees Date: Wed, 11 Sep 2024 15:48:55 +0100 Subject: rabbitmq: Switch to Cloudsmith mirrors PackageCloud is discontinued as of August 18th [1]. Also corrects the versions docs for RabbitMQ and Erlang. Use new RMQ Cloudsmith repo URLs, these now use *.rabbitmq.com domains [2]. 1. https://www.rabbitmq.com/blog/2024/08/11/package-repository-updates#packagecloud-will-be-discontinued-on-aug-18th-2024 2. https://www.rabbitmq.com/blog/2024/08/11/package-repository-updates#mirrors-now-use-rabbitmqcom-domains Change-Id: I2cce3dd2540c878878ff0aae80ee5a7e0f455da7 --- kolla/template/repos.yaml | 8 ++++---- kolla/tests/test_methods.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'kolla') diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 1c7572b48..65cb7b745 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -80,7 +80,7 @@ debian: component: "" gpg_key: "proxysql.asc" rabbitmq: - url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian" + url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian" suite: "bullseye" component: "main" gpg_key: "rabbitmq.gpg" @@ -127,7 +127,7 @@ debian-aarch64: component: "" gpg_key: "proxysql.asc" rabbitmq: - url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian" + url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian" suite: "bullseye" component: "main" # NOTE(mnasiadka): Since rabbitmq is really noarch and community mirror is not @@ -213,7 +213,7 @@ ubuntu: component: "" gpg_key: "proxysql.asc" rabbitmq: - url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu" + url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu" suite: "jammy" component: "main" gpg_key: "rabbitmq.gpg" @@ -260,7 +260,7 @@ ubuntu-aarch64: component: "" gpg_key: "proxysql.asc" rabbitmq: - url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu" + url: "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/ubuntu" suite: "jammy" component: "main" arch: "amd64" diff --git a/kolla/tests/test_methods.py b/kolla/tests/test_methods.py index 3ce9c6f9f..dcdc4f4e9 100644 --- a/kolla/tests/test_methods.py +++ b/kolla/tests/test_methods.py @@ -86,7 +86,7 @@ class MethodsTest(base.TestCase): } result = methods.handle_repos(template_vars, ['rabbitmq'], 'enable') - expectCmd = "RUN echo 'Uris: https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501 + expectCmd = "RUN echo 'Uris: https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian' " # 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.novemberain.com/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501 + expectCmd += "https://ppa1.rabbitmq.com/rabbitmq/rabbitmq-server/deb/debian' " # noqa: E501 expectCmd += ">/etc/apt/sources.list.d/rabbitmq.sources && " expectCmd += "echo 'Components: main' " expectCmd += ">>/etc/apt/sources.list.d/rabbitmq.sources && " -- cgit v1.2.3