diff options
| author | Zuul <zuul@review.opendev.org> | 2023-06-22 18:01:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-06-22 18:01:36 +0000 |
| commit | ee8c40c860b15977037e2fd79c5ceeeb2afe9a74 (patch) | |
| tree | c4037f0639601c24aa2e25002ea106e68c155153 | |
| parent | 3dcfde5cc0f3b964681790aef28c5dbb4c631907 (diff) | |
| parent | 0e83e2a739cdd412dfa1abc9e45218187be31af2 (diff) | |
| download | kolla-ee8c40c860b15977037e2fd79c5ceeeb2afe9a74.tar.gz kolla-ee8c40c860b15977037e2fd79c5ceeeb2afe9a74.zip | |
Merge "rabbitmq: use erlang-25 ppa on Debian/Ubuntu" into stable/zed
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/base/apt_preferences.debian | 4 | ||||
| -rw-r--r-- | docker/base/apt_preferences.ubuntu | 4 | ||||
| -rw-r--r-- | kolla/template/repos.yaml | 8 |
4 files changed, 5 insertions, 13 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index b351ce592..f056a8349 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -287,7 +287,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom ] %} {% set base_apt_keys = [ - {'name': 'erlang-ppa', 'keyid': 'E495BB49CC4BBE5B'}, + {'name': 'erlang-ppa', 'keyid': 'F77F1EDA57EBB1CC'}, {'name': 'rabbitmq', 'keyid': '9F4587F226208342'}, {'name': 'haproxy', 'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'}, ] %} diff --git a/docker/base/apt_preferences.debian b/docker/base/apt_preferences.debian index 7b5d4631b..f20d6ad4d 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -2,10 +2,6 @@ Package: rabbitmq-server Pin: version 3.10.* Pin-Priority: 1000 -Package: erlang* -Pin: version 1:25.* -Pin-Priority: 1000 - # NOTE(hrw): we do not want backports unless requested Package: * Pin: release n=bullseye-backports diff --git a/docker/base/apt_preferences.ubuntu b/docker/base/apt_preferences.ubuntu index 8e6a9070f..940130c9b 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -2,10 +2,6 @@ Package: rabbitmq-server Pin: version 3.10.* Pin-Priority: 1000 -Package: erlang* -Pin: version 1:25.* -Pin-Priority: 1000 - Package: * Pin: origin dlm.mariadb.com Pin-Priority: 1000 diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml index ea05f5249..8e5a8ba64 100644 --- a/kolla/template/repos.yaml +++ b/kolla/template/repos.yaml @@ -37,7 +37,7 @@ centos-aarch64: debian: erlang: - url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu" + url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu" suite: "focal" component: "main" gpg_key: "erlang-ppa.gpg" @@ -84,7 +84,7 @@ debian: debian-aarch64: erlang: - url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu" + url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu" suite: "focal" component: "main" gpg_key: "erlang-ppa.gpg" @@ -167,7 +167,7 @@ rocky-aarch64: ubuntu: erlang: - url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu" + url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu" suite: "jammy" component: "main" gpg_key: "erlang-ppa.gpg" @@ -214,7 +214,7 @@ ubuntu: ubuntu-aarch64: erlang: - url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu" + url: "https://launchpad.net/~rabbitmq/+archive/ubuntu/rabbitmq-erlang-25" suite: "jammy" component: "main" gpg_key: "erlang-ppa.gpg" |