diff options
| author | Zuul <zuul@review.opendev.org> | 2023-06-21 16:19:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2023-06-21 16:19:28 +0000 |
| commit | 427c8b66aafe65d051afd15f5cb82b60298860d5 (patch) | |
| tree | 46a5dfbca05396e54a0adb0627790aa633aa4b9b | |
| parent | 60603d240cf26fa9bed8f7883ccfd5ae51c36f2e (diff) | |
| parent | 0e881148d0036f27b95c5a27459e527fb3b0476d (diff) | |
| download | kolla-427c8b66aafe65d051afd15f5cb82b60298860d5.tar.gz kolla-427c8b66aafe65d051afd15f5cb82b60298860d5.zip | |
Merge "rabbitmq: use erlang-25 ppa on Debian/Ubuntu"
| -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 2c5710422..3eb12733e 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -283,7 +283,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 9098c77b8..f2b0a7d0f 100644 --- a/docker/base/apt_preferences.debian +++ b/docker/base/apt_preferences.debian @@ -2,10 +2,6 @@ Package: rabbitmq-server Pin: version 3.11.16-1 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 3d38f003c..dbee137dd 100644 --- a/docker/base/apt_preferences.ubuntu +++ b/docker/base/apt_preferences.ubuntu @@ -2,10 +2,6 @@ Package: rabbitmq-server Pin: version 3.11.16-1 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 6f6e8c899..f1b97ed63 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" |