diff options
| author | Zuul <zuul@review.opendev.org> | 2022-09-29 17:10:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-09-29 17:10:29 +0000 |
| commit | 237013960425e4ff6cbc4814d4f9d61efcf601de (patch) | |
| tree | ddd0e1df0f4e6c1436dc6aa9a17df0dfe82eac42 | |
| parent | 3fde977d456bd3e7621b3a88be87be8d0a62cd22 (diff) | |
| parent | 0ed6f6f12091a7c4df18b737fc2c937e508322ec (diff) | |
| download | kolla-237013960425e4ff6cbc4814d4f9d61efcf601de.tar.gz kolla-237013960425e4ff6cbc4814d4f9d61efcf601de.zip | |
Merge "debian: use Erlang 24 on AArch64"
| -rw-r--r-- | docker/base/apt_preferences.debian | 6 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 24b13e190..0fadc03ff 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -6,6 +6,12 @@ Package: erlang* Pin: version 1:25.* Pin-Priority: 1000 +# On AArch64 we do not have Erlang 25 yet +Package: erlang* +Pin: version 1:24.* +Pin: release b=arm64 +Pin-Priority: 1000 + # NOTE(mgoddard): logstash 7.9.x is the last version that supports # Elasticsearch OSS. Package: logstash-oss diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index 7e97c4dd8..867090c4b 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -94,11 +94,6 @@ debian-aarch64: suite: "stable" component: "main" gpg_key: "elasticsearch.asc" - erlang: - url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian" - suite: "bullseye" - component: "main" - gpg_key: "erlang.gpg" grafana: url: "https://packages.grafana.com/oss/deb" suite: "stable" |