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 /docker | |
| 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 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 02bb5b9c6..1482a7539 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -283,11 +283,16 @@ 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'}, |