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

Author: Zuul

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

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

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

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"