Merge "rabbitmq: use launchpad as erlang source for Ubuntu"

Author: Zuul

docker/base/Dockerfile.j2

@@ -283,16 +283,11 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
 ] %}
 
 {% set base_apt_keys = [
+   {'name': 'erlang-ppa', 'keyid': 'F77F1EDA57EBB1CC'},
    {'name': 'rabbitmq',   'keyid': '9F4587F226208342'},
    {'name': 'haproxy',    'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'},
 ] %}
 
-{% if base_arch == 'aarch64' %}
-{% set base_apt_keys = base_apt_keys + [{'name': 'erlang-ppa', 'keyid': 'F77F1EDA57EBB1CC'}] %}
-{% else %}
-{% set base_apt_keys = base_apt_keys + [{'name': 'erlang-ppa', 'keyid': 'E495BB49CC4BBE5B'}] %}
-{% endif %}
-
 {# NOTE(hrw): type field defaults to 'asc' which is used for single keys #}
 {% set base_remote_apt_keys = [
    {'name': 'grafana', 'url': 'https://rpm.grafana.com/gpg.key'},

kolla/template/repos.yaml

@@ -171,7 +171,7 @@ rocky-aarch64:
 
 ubuntu:
   erlang:
-    url: "https://ppa1.novemberain.com/rabbitmq/rabbitmq-erlang/deb/ubuntu"
+    url: "https://ppa.launchpadcontent.net/rabbitmq/rabbitmq-erlang/ubuntu"
     suite: "jammy"
     component: "main"
     gpg_key: "erlang-ppa.gpg"