Merge pull request #242 from stackhpc/upstream/xena-2023-07-17

Synchronise xena with upstream

Author: markgoddard

docker/base/apt_preferences.debian

@@ -2,10 +2,6 @@ Package: rabbitmq-server
 Pin: version 3.9.*
 Pin-Priority: 1000
 
-Package: erlang*
-Pin: version 1:25.*
-Pin-Priority: 1000
-
 # NOTE(mgoddard): logstash 7.9.x is the last version that supports
 # Elasticsearch OSS.
 Package: logstash-oss

docker/base/apt_preferences.ubuntu

@@ -2,10 +2,6 @@ Package: rabbitmq-server
 Pin: version 3.9.*
 Pin-Priority: 1000
 
-Package: erlang*
-Pin: version 1:25.*
-Pin-Priority: 1000
-
 # NOTE(mgoddard): logstash 7.9.x is the last version that supports
 # Elasticsearch OSS.
 Package: logstash-oss

kolla/template/repos.yaml

@@ -49,7 +49,7 @@ debian:
     component: "main"
     gpg_key: "elasticsearch.asc"
   erlang:
-    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
     suite: "focal"
     component: "main"
     gpg_key: "erlang-ppa.gpg"
@@ -101,7 +101,7 @@ debian-aarch64:
     component: "main"
     gpg_key: "elasticsearch.asc"
   erlang:
-    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
     suite: "focal"
     component: "main"
     gpg_key: "erlang-ppa.gpg"
@@ -153,7 +153,7 @@ ubuntu:
     component: "main"
     gpg_key: "elasticsearch.asc"
   erlang:
-    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang-25/ubuntu"
     suite: "focal"
     component: "main"
     gpg_key: "erlang-ppa.gpg"
@@ -210,7 +210,7 @@ ubuntu-aarch64:
     component: "main"
     gpg_key: "elasticsearch.asc"
   erlang:
-    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
+    url: "https://launchpad.net/~rabbitmq/+archive/ubuntu/rabbitmq-erlang-25"
     suite: "focal"
     component: "main"
     gpg_key: "erlang-ppa.gpg"