diff options
| author | Zuul <zuul@review.opendev.org> | 2023-09-29 22:46:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-09-29 22:46:40 +0000 |
| commit | 366abde6be829e00c4fb03b1324ce30d9cd200a3 (patch) | |
| tree | b0f794edaf08bd041f164b78bdcf5f27eac5e226 | |
| parent | abd9829343c649c12486b178c8c51d774bfc9703 (diff) | |
| parent | 5ef06be743cb5efd3eec93d1f63637e2b98c1bc2 (diff) | |
| download | kolla-366abde6be829e00c4fb03b1324ce30d9cd200a3.tar.gz kolla-366abde6be829e00c4fb03b1324ce30d9cd200a3.zip | |
Merge "rabbitmq: use launchpad as erlang source for Ubuntu"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 1482a7539..02bb5b9c6 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -283,16 +283,11 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom ] %} {% set base_apt_keys = [ + {'name': 'erlang-ppa', 'keyid': 'F77F1EDA57EBB1CC'}, {'name': 'rabbitmq', 'keyid': '9F4587F226208342'}, {'name': 'haproxy', 'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'}, ] %} -{% if base_arch == 'aarch64' %} -{% set base_apt_keys = base_apt_keys + [{'name': 'erlang-ppa', 'keyid': 'F77F1EDA57EBB1CC'}] %} -{% else %} -{% set base_apt_keys = base_apt_keys + [{'name': 'erlang-ppa', 'keyid': 'E495BB49CC4BBE5B'}] %} -{% endif %} - {# NOTE(hrw): type field defaults to 'asc' which is used for single keys #} {% set base_remote_apt_keys = [ {'name': 'grafana', 'url': 'https://rpm.grafana.com/gpg.key'}, diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index d0f016c11..12914956d 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -171,7 +171,7 @@ rocky-aarch64: ubuntu: erlang: - url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu" + url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu" suite: "jammy" component: "main" gpg_key: "erlang-ppa.gpg" |