rabbitmq: Move to packagecloud

bintray is being shut down 1st of May 2021, rabbitmq docs direct
users to packagecloud - so let's move.

Change-Id: I499251d13ca77aea2215f8a879b7bb8dd51f1c9f

4 files changed, 9 insertions, 10 deletions

diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index a87c91e08..fc55949ee 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -86,7 +86,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
         'https://artifacts.elastic.co/GPG-KEY-elasticsearch',
         'https://packages.grafana.com/gpg.key',
         'https://repos.influxdata.com/influxdb.key',
-        'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc',
+        'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
         'https://packages.treasuredata.com/GPG-KEY-td-agent',
     ] %}
 {% elif base_arch == 'aarch64' %}
@@ -99,7 +99,7 @@ COPY dnf.conf /etc/dnf/dnf.conf
 
     {% set base_yum_repo_keys = [
         'https://packages.grafana.com/gpg.key',
-        'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc',
+        'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
     ] %}
     # FIXME(mgoddard): Not available for CentOS 8 yet.
     #
@@ -359,6 +359,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
     {# 901F9177AB97ACBE                         -- Treasure Data, Inc (Treasure Agent Official Signing key) <support@treasure-data.com> #}
     {# A20F259AEB9C94BB                         -- Sensuapp (Freight) <support@hw-ops.com> #}
     {# F1656F24C74CD1D8                         -- MariaDB Signing Key <signing-key@mariadb.org> #}
+    {# F77F1EDA57EBB1CC                         -- RabbitMQ Signing Key <info@rabbitmq.com> #}
     {% set base_apt_keys = [
       '391A9AA2147192839E9DB0315EDB1B62EC4926EA',
       '46095ACC8548582C1A2699A9D27D666CD88E42B4',
@@ -368,15 +369,16 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
       '901F9177AB97ACBE',
       'A20F259AEB9C94BB',
       'F1656F24C74CD1D8',
+      'F77F1EDA57EBB1CC',
     ] %}
     {% set remote_apt_keys = [
-      'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc',
       'https://packages.grafana.com/gpg.key',
       'https://repos.influxdata.com/influxdb.key',
     ] %}
 {% elif base_distro == 'debian' %}
     {% set base_apt_keys = [
       '46095ACC8548582C1A2699A9D27D666CD88E42B4',
+      'F77F1EDA57EBB1CC',
     ] %}
     {% set remote_apt_keys = [
       'https://download.docker.com/linux/debian/gpg',
@@ -385,7 +387,6 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
       'https://packages.treasuredata.com/GPG-KEY-td-agent',
       'https://repos.influxdata.com/influxdb.key',
       'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster/Release.key',
-      'https://www.rabbitmq.com/rabbitmq-release-signing-key.asc',
     ] %}
 {% endif %}
 
diff --git a/docker/base/rabbitmq_rabbitmq-erlang.repo b/docker/base/rabbitmq_rabbitmq-erlang.repo
index c9d9aed42..bcb4f40f1 100644
--- a/docker/base/rabbitmq_rabbitmq-erlang.repo
+++ b/docker/base/rabbitmq_rabbitmq-erlang.repo
@@ -1,6 +1,5 @@
 [rabbitmq_rabbitmq-erlang]
 name=rabbitmq_rabbitmq-erlang
-baseurl=https://dl.bintray.com/rabbitmq-erlang/rpm/erlang/22/el/$releasever/
+baseurl=https://packagecloud.io/rabbitmq/erlang/el/8/$basearch
 gpgcheck=1
 enabled=0
-gpgkey=https://www.rabbitmq.com/rabbitmq-release-signing-key.asc
diff --git a/docker/base/rabbitmq_rabbitmq-server.repo b/docker/base/rabbitmq_rabbitmq-server.repo
index 50f307d86..0bbf8a82f 100644
--- a/docker/base/rabbitmq_rabbitmq-server.repo
+++ b/docker/base/rabbitmq_rabbitmq-server.repo
@@ -1,6 +1,5 @@
 [rabbitmq_rabbitmq-server]
 name=rabbitmq_rabbitmq-server
-baseurl=https://dl.bintray.com/rabbitmq/rpm/rabbitmq-server/v3.8.x/el/$releasever/
+baseurl=https://packagecloud.io/rabbitmq/rabbitmq-server/el/8/$basearch
 gpgcheck=1
 enabled=0
-gpgkey=https://www.rabbitmq.com/rabbitmq-release-signing-key.asc
diff --git a/docker/base/sources.list.ubuntu b/docker/base/sources.list.ubuntu
index 288deb16e..c6ef7febe 100644
--- a/docker/base/sources.list.ubuntu
+++ b/docker/base/sources.list.ubuntu
@@ -34,10 +34,10 @@ deb http://ubuntu-cloud.archive.canonical.com/ubuntu focal-updates/victoria main
 #deb http://ppa.launchpad.net/qpid/released/ubuntu/ focal main
 
 # rabbitmq repo
-#deb https://dl.bintray.com/rabbitmq/debian/ focal main
+#deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main
 
 # erlang repo
-#deb https://dl.bintray.com/rabbitmq-erlang/debian/ focal erlang
+#deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu focal main
 
 # erlang repo - aarch64 only
 #deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-focal ./