Fix Ubuntu image builds

Regarding rabbitmq and erlang.

Change-Id: I6bc8b489a810849744c8bead6b9e350c5d3e36b7
(cherry picked from commit 240b3cf)

docker/base/Dockerfile.j2

@@ -322,8 +322,8 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
 ] %}
 
 {% set base_apt_keys = [
-   {'name': 'erlang',   'keyid': 'F77F1EDA57EBB1CC'},
-   {'name': 'rabbitmq', 'keyid': 'F6609E60DC62814E'},
+   {'name': 'erlang',   'keyid': 'E495BB49CC4BBE5B'},
+   {'name': 'rabbitmq', 'keyid': '9F4587F226208342'},
    {'name': 'haproxy',  'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'},
 ] %}
 

kolla/template/repos.yaml

@@ -49,9 +49,8 @@ debian:
     component: "main"
     gpg_key: "elasticsearch.asc"
   erlang:
-    # NOTE(mnasiadka): Erlang repo - Debian Buster/Bullseye needs to use bionic as per RabbitMQ docs
-    url: "http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu"
-    suite: "bionic"
+    url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian"
+    suite: "bullseye"
     component: "main"
     gpg_key: "erlang.gpg"
   grafana:
@@ -80,7 +79,7 @@ debian:
     component: "main"
     gpg_key: "mariadb.gpg"
   rabbitmq:
-    url: "https://packagecloud.io/rabbitmq/rabbitmq-server/debian/"
+    url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian"
     suite: "bullseye"
     component: "main"
     gpg_key: "rabbitmq.gpg"
@@ -102,9 +101,8 @@ debian-aarch64:
     component: "main"
     gpg_key: "elasticsearch.asc"
   erlang:
-    # NOTE(mnasiadka): Erlang repo - Debian Buster/Bullseye needs to use bionic as per RabbitMQ docs
-    url: "http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu"
-    suite: "bionic"
+    url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/debian"
+    suite: "bullseye"
     component: "main"
     gpg_key: "erlang.gpg"
   grafana:
@@ -133,7 +131,7 @@ debian-aarch64:
     component: "main"
     gpg_key: "mariadb.gpg"
   rabbitmq:
-    url: "https://packagecloud.io/rabbitmq/rabbitmq-server/debian/"
+    url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/debian"
     suite: "bullseye"
     component: "main"
     gpg_key: "rabbitmq.gpg"
@@ -155,7 +153,7 @@ ubuntu:
     component: "main"
     gpg_key: "elasticsearch.asc"
   erlang:
-    url: "http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu"
+    url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu"
     suite: "focal"
     component: "main"
     gpg_key: "erlang.gpg"
@@ -190,7 +188,7 @@ ubuntu:
     component: "main"
     gpg_key: "mariadb.gpg"
   rabbitmq:
-    url: "https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/"
+    url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu"
     suite: "focal"
     component: "main"
     gpg_key: "rabbitmq.gpg"
@@ -212,7 +210,7 @@ ubuntu-aarch64:
     component: "main"
     gpg_key: "elasticsearch.asc"
   erlang:
-    url: "http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu"
+    url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/ubuntu"
     suite: "focal"
     component: "main"
     gpg_key: "erlang.gpg"
@@ -242,7 +240,7 @@ ubuntu-aarch64:
     component: "main"
     gpg_key: "mariadb.gpg"
   rabbitmq:
-    url: "https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/"
+    url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/ubuntu"
     suite: "focal"
     component: "main"
     gpg_key: "rabbitmq.gpg"

releasenotes/notes/rabbitmq-erlang-cloudsmith-c837bf4a450dd802.yaml

@@ -0,0 +1,10 @@
+---
+fixes:
+  - |
+    Fixes the Debian and Ubuntu images to use rabbitmq and erlang from
+    cloudsmith so that the images are still buildable and use proper versions.
+upgrade:
+  - |
+    The Debian and Ubuntu images use rabbitmq and erlang from cloudsmith now.
+    Operators might want to mirror/proxy this new source as it provides the
+    correct set of packages unlike the previous combination.