rabbitmq: Move to packagecloud

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

For Victoria and below, includes I6a3ba599af3deedd450b4ffff6b86a0c04628340
(base: drop Linaro OBS key for CentOS and Ubuntu)

Change-Id: I499251d13ca77aea2215f8a879b7bb8dd51f1c9f
(cherry picked from commit 641b936)

Author: mnasiadka

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,8 +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://obs.linaro.org/repos/home:/marcin.juszkiewicz/centos7/repodata/repomd.xml.key',
+        'https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc',
     ] %}
     # FIXME(mgoddard): Not available for CentOS 8 yet.
     #
@@ -342,6 +341,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom
     {# 901F9177AB97ACBE                         -- Treasure Data, Inc (Treasure Agent Official Signing key) <[email protected]> #}
     {# A20F259AEB9C94BB                         -- Sensuapp (Freight) <[email protected]> #}
     {# F1656F24C74CD1D8                         -- MariaDB Signing Key <[email protected]> #}
+    {# F77F1EDA57EBB1CC                         -- RabbitMQ Signing Key <[email protected]> #}
     {% set base_apt_keys = [
       '391A9AA2147192839E9DB0315EDB1B62EC4926EA',
       '46095ACC8548582C1A2699A9D27D666CD88E42B4',
@@ -351,20 +351,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',
     ] %}
-    {% if base_arch == 'aarch64' %}
-        {% set remote_apt_keys = remote_apt_keys + [
-          'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-bionic/Release.key',
-        ] %}
-    {% endif %}
 {% elif base_distro == 'debian' %}
     {% set base_apt_keys = [
       '46095ACC8548582C1A2699A9D27D666CD88E42B4',
+      'F77F1EDA57EBB1CC',
     ] %}
     {% set remote_apt_keys = [
       'https://download.docker.com/linux/debian/gpg',
@@ -373,13 +369,7 @@ 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',
     ] %}
-    {% if base_arch == 'aarch64' %}
-        {% set remote_apt_keys = remote_apt_keys + [
-          'https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster/Release.key',
-        ] %}
-    {% endif %}
     {% set base_apt_packages = base_apt_packages +
       ['sudo',]
     %}

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

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

docker/base/sources.list.debian

@@ -31,6 +31,3 @@ deb http://buster-victoria.debian.net/debian buster-victoria-backports-nochange
 
 # erlang repo
 #deb https://dl.bintray.com/rabbitmq-erlang/debian/ buster erlang
-
-# erlang repo - aarch64 only
-#deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./

docker/base/sources.list.ubuntu

@@ -34,13 +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
-
-# erlang repo - aarch64 only
-#deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-focal ./
+#deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu focal main
 
 # MariaDB repo
 #deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main

kolla/template/repos.yaml

@@ -47,50 +47,50 @@ rhel:
   opstools: "centos-opstools"
   rabbitmq: "centos-rabbitmq-38"
 
+# NOTE(mnasiadka): Erlang repo - Debian Buster/Bullseye needs to use bionic as per RabbitMQ docs
 debian:
   elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
-  erlang: "deb https://dl.bintray.com/rabbitmq-erlang/debian/ buster erlang"
+  erlang: "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu bionic main"
   grafana: "deb https://packages.grafana.com/oss/deb stable main"
   influxdb: "deb https://repos.influxdata.com/debian buster stable"
   logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
   kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
-  rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ buster main"
+  rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/debian/ buster main"
   td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib"
 
 debian-aarch64:
   elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
-  erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./"
+  erlang: "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu bionic main"
   grafana: "deb https://packages.grafana.com/oss/deb stable main"
   influxdb: "deb https://repos.influxdata.com/debian buster stable"
   logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
   kibana: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
   libvirt: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/debian-buster ./"
-  rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ buster main"
+  rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/debian/ buster main"
   td-agent: "deb http://packages.treasuredata.com/4/debian/buster buster contrib"
 
 ubuntu:
   elasticsearch: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
-  erlang: "deb https://dl.bintray.com/rabbitmq-erlang/debian/ focal erlang"
+  erlang: "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu focal main"
   grafana: "deb https://packages.grafana.com/oss/deb stable main"
   influxdb: "deb https://repos.influxdata.com/ubuntu focal stable"
   logstash: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
   kibana: "deb https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
   mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main"
   qdrouterd: "deb http://ppa.launchpad.net/qpid/released/ubuntu/ focal main"
-  # NOTE(hrw): upstream uses bionic repo for focal
-  rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"
+  rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main"
   td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib"
 
 ubuntu-aarch64:
   elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
-  erlang: "deb https://obs.linaro.org/repos/home:/marcin.juszkiewicz/ubuntu-focal ./"
+  erlang: "deb http://ppa.launchpad.net/rabbitmq/rabbitmq-erlang/ubuntu focal main"
   grafana: "deb https://packages.grafana.com/oss/deb stable main"
   influxdb: "deb https://repos.influxdata.com/ubuntu focal stable"
   logstash: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"
   mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu bionic main"
-  rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"
+  rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main"
   td-agent: "deb http://packages.treasuredata.com/4/ubuntu/focal/ focal contrib"
 
 ubuntu-ppc64le:
   mariadb: "deb http://downloads.mariadb.com/MariaDB/mariadb-10.3/repo/ubuntu focal main"
-  rabbitmq: "deb https://dl.bintray.com/rabbitmq/debian/ bionic main"
+  rabbitmq: "deb https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ focal main"

releasenotes/notes/rabbitmq-packagecloud-c009ff6d0d2bd02d.yaml

@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    RabbitMQ and Erlang packages are now installed from ``packagecloud.io``
+    (and PPA for Debian/Ubuntu) since ``bintray.com`` is getting shut down
+    May 1st, 2021.