From 5ef06be743cb5efd3eec93d1f63637e2b98c1bc2 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Fri, 29 Sep 2023 13:14:03 +0200
Subject: [PATCH] rabbitmq: use launchpad as erlang source for Ubuntu

Launchpad is not traffic constrained, so let's better use that,
instead of the community mirror.

Change-Id: Ie9e0f574c8e3a61e67736caa3faedb8602a5adde
---
 docker/base/Dockerfile.j2 | 7 +------
 kolla/template/repos.yaml | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 1482a7539f..02bb5b9c6d 100644
--- a/docker/base/Dockerfile.j2
+++ b/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'},
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index d0f016c110..12914956db 100644
--- a/kolla/template/repos.yaml
+++ b/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"