openstack
/
kolla
Code Issues Proposed changes

Merge "rabbitmq: use erlang-25 ppa on Debian/Ubuntu"

This commit is contained in:
Zuul 2023-06-21 16:19:28 +00:00 committed by Gerrit Code Review
parent 60603d240c 0e881148d0
commit 427c8b66aa
4 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/base/Dockerfile.j2
View File

@ -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'},
] %}

4
docker/base/apt_preferences.debian
View File

@ -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

4
docker/base/apt_preferences.ubuntu
View File

@ -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

8
kolla/template/repos.yaml
View File

@ -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"