diff options
| author | Zuul <zuul@review.opendev.org> | 2022-10-18 13:57:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-10-18 13:57:28 +0000 |
| commit | 2521ce1283ec82c7274c2eb93ad8c16427eb206d (patch) | |
| tree | 2b984bbb779254892cfaab09f6443bb5ee9a2ca7 | |
| parent | 7063c02b6036e0b6e1d678d9c7af168983e9cdfc (diff) | |
| parent | b40506f6dd382e1b2443dc59b918b01e2db45850 (diff) | |
| download | kolla-2521ce1283ec82c7274c2eb93ad8c16427eb206d.tar.gz kolla-2521ce1283ec82c7274c2eb93ad8c16427eb206d.zip | |
Merge "rabbitmq: use Erlang from PPA on Debian/Ubuntu"
| -rw-r--r-- | docker/base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/base/apt_preferences.debian | 6 | ||||
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 6 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 19 |
4 files changed, 15 insertions, 22 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index d54a4680e..3dbf49770 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -318,9 +318,9 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom ] %} {% set base_apt_keys = [ - {'name': 'erlang', 'keyid': 'E495BB49CC4BBE5B'}, - {'name': 'rabbitmq', 'keyid': '9F4587F226208342'}, - {'name': 'haproxy', 'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'}, + {'name': 'erlang-ppa', 'keyid': 'F77F1EDA57EBB1CC'}, + {'name': 'rabbitmq', 'keyid': '9F4587F226208342'}, + {'name': 'haproxy', 'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'}, ] %} {# NOTE(hrw): type field defaults to 'asc' which is used for single keys #} diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 51e5e2d2d..ba7e14b7f 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -6,12 +6,6 @@ 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/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index c6bce9e43..d6a262861 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -6,12 +6,6 @@ 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 b93612531..96ab9040b 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -44,10 +44,10 @@ debian: component: "main" gpg_key: "elasticsearch.asc" erlang: - url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian" - suite: "bullseye" + url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu" + suite: "focal" component: "main" - gpg_key: "erlang.gpg" + gpg_key: "erlang-ppa.gpg" grafana: url: "https://packages.grafana.com/oss/deb" suite: "stable" @@ -95,6 +95,11 @@ debian-aarch64: suite: "stable" component: "main" gpg_key: "elasticsearch.asc" + erlang: + url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu" + suite: "focal" + component: "main" + gpg_key: "erlang-ppa.gpg" grafana: url: "https://packages.grafana.com/oss/deb" suite: "stable" @@ -181,10 +186,10 @@ ubuntu: component: "main" gpg_key: "elasticsearch.asc" erlang: - url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu" + url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu" suite: "jammy" component: "main" - gpg_key: "erlang.gpg" + gpg_key: "erlang-ppa.gpg" grafana: url: "https://packages.grafana.com/oss/deb" suite: "stable" @@ -233,10 +238,10 @@ ubuntu-aarch64: component: "main" gpg_key: "elasticsearch.asc" erlang: - url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu" + url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu" suite: "jammy" component: "main" - gpg_key: "erlang.gpg" + gpg_key: "erlang-ppa.gpg" grafana: url: "https://packages.grafana.com/oss/deb" suite: "stable" |