diff options
| author | Michal Nasiadka <mnasiadka@gmail.com> | 2023-09-27 08:12:10 +0000 |
|---|---|---|
| committer | Michal Nasiadka <mnasiadka@gmail.com> | 2023-09-29 13:47:20 +0000 |
| commit | d67fd2fcbc38cde5351f6e41c579758be71cd5d6 (patch) | |
| tree | a9c5f34d721658567fd88c8e65598027893216ff /kolla/template | |
| parent | cc9b83acdc7da4501da765e38eaad53b7fa17c6f (diff) | |
| download | kolla-d67fd2fcbc38cde5351f6e41c579758be71cd5d6.tar.gz kolla-d67fd2fcbc38cde5351f6e41c579758be71cd5d6.zip | |
rabbitmq: Use novemberain repos for Debian/Ubuntu
CloudSmith is over budget, see [1].
As mentionedin in [2] - we're using amd64 packages on aarch64,
since the community mirror does not mirror aarch64 - and the packages
should be really marked as noarch.
[3] has also been incorporated in this backport
[1]: https://github.com/rabbitmq/rabbitmq-server/discussions/9526
[2]: https://github.com/rabbitmq/rabbitmq-server/discussions/9553
[3]: https://review.opendev.org/c/openstack/kolla/+/896927
Closes-Bug: #2037469
Change-Id: I83179ce5d53fed6cfe7f5fcbf6fdecd7199baa36
(cherry picked from commit 47b593d1e5531c693dde3e111ed3be91c60c41be)
Diffstat (limited to 'kolla/template')
| -rw-r--r-- | kolla/template/methods.py | 4 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 10 |
2 files changed, 10 insertions, 4 deletions
diff --git a/kolla/template/methods.py b/kolla/template/methods.py index 6b647de65..1a5926702 100644 --- a/kolla/template/methods.py +++ b/kolla/template/methods.py @@ -127,6 +127,10 @@ def handle_repos(context, reponames, mode): && echo 'Signed-By: /etc/kolla/apt-keys/{repo_list[repo]['gpg_key']}' \ >>/etc/apt/sources.list.d/{repo}.sources \ && """ + if repo_list[repo]['arch']: + commands += f"""echo 'Architectures: {repo_list[repo]['arch']}' \ +>>/etc/apt/sources.list.d/{repo}.sources \ +&& """ except KeyError: # NOTE(hrw): we ignore missing repositories for a given # distro/arch diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 0a60f4ae9..1dfae5940 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -72,7 +72,7 @@ debian: component: "" gpg_key: "proxysql.asc" rabbitmq: - url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian" + url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian" suite: "bullseye" component: "main" gpg_key: "rabbitmq.gpg" @@ -119,9 +119,10 @@ debian-aarch64: component: "" gpg_key: "proxysql.asc" rabbitmq: - url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian" + url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian" suite: "bullseye" component: "main" + arch: "amd64" gpg_key: "rabbitmq.gpg" td-agent: url: "http://packages.treasuredata.com/4/debian/bullseye" @@ -202,7 +203,7 @@ ubuntu: component: "" gpg_key: "proxysql.asc" rabbitmq: - url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu" + url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu" suite: "jammy" component: "main" gpg_key: "rabbitmq.gpg" @@ -249,9 +250,10 @@ ubuntu-aarch64: component: "" gpg_key: "proxysql.asc" rabbitmq: - url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu" + url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/ubuntu" suite: "jammy" component: "main" + arch: "amd64" gpg_key: "rabbitmq.gpg" td-agent: url: "http://packages.treasuredata.com/4/ubuntu/jammy/" |