diff options
| author | Zuul <zuul@review.opendev.org> | 2023-09-29 10:11:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-09-29 10:11:42 +0000 |
| commit | 29fbfbe5c45067aa406eeb908c17064ed01ac3c9 (patch) | |
| tree | 5d77b7a3b358bfa1a9451dd64dca1dab95ad2428 /kolla/template | |
| parent | fcfa3278c1b9f4240dbae36847e91c713df14797 (diff) | |
| parent | 47b593d1e5531c693dde3e111ed3be91c60c41be (diff) | |
| download | kolla-29fbfbe5c45067aa406eeb908c17064ed01ac3c9.tar.gz kolla-29fbfbe5c45067aa406eeb908c17064ed01ac3c9.zip | |
Merge "rabbitmq: Use novemberain repos for Debian/Ubuntu"
Diffstat (limited to 'kolla/template')
| -rw-r--r-- | kolla/template/methods.py | 4 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 16 |
2 files changed, 13 insertions, 7 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 3b10851ac..d0f016c11 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -73,8 +73,8 @@ debian: component: "" gpg_key: "proxysql.asc" rabbitmq: - url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian" - suite: "bookworm" + url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-server/deb/debian" + suite: "bullseye" component: "main" gpg_key: "rabbitmq.gpg" td-agent: @@ -122,9 +122,10 @@ debian-aarch64: component: "" gpg_key: "proxysql.asc" rabbitmq: - url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian" - suite: "bookworm" + 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/ubuntu/jammy" @@ -170,7 +171,7 @@ rocky-aarch64: ubuntu: erlang: - url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu" + url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu" suite: "jammy" component: "main" gpg_key: "erlang-ppa.gpg" @@ -205,7 +206,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" @@ -252,9 +253,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/" |