Use cloudsmith repo for rabbit and erlang

Switch to using cloudsmith repo as a source for rabbitmq and erlang.

This allows us to be consistent about repository that is
used across supported distributions along with switching from
unreliable erlang-solutions that tend to fail periodically.

Change-Id: Ia438ee3b0aa1ba95aff014776e936516b83181ec

vars/debian.yml

@@ -17,18 +17,21 @@ _rabbitmq_install_method: external_repo
 _rabbitmq_package_version: "3.9.8-1"
 
 _rabbitmq_gpg_keys:
-  - file: gpg/4D206F89
-  - file: gpg/A14F4FCA
+  - file: gpg/C072C960 # RabbitMQ Cloudsmith repo
+  - file: gpg/A16A4251 # Erlang Cloudsmith repo
+  - file: gpg/0A9AF211 # RabbitMQ Release Signing Key
 
-_rabbitmq_repo_url: "https://packagecloud.io/rabbitmq/rabbitmq-server/{{ ansible_facts['distribution'] | lower }}"
+# NOTE(noonedeadpunk): List of available packages can be searched here: https://cloudsmith.io/~rabbitmq/repos/
+
+_rabbitmq_repo_url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/deb/{{ ansible_facts['distribution'] | lower }}"
 _rabbitmq_repo:
   repo: "deb {{ rabbitmq_repo_url }} {{ ansible_facts['distribution_release'] | lower }} main"
   state: "present"
   filename: "RabbitMQ"
 
-_rabbitmq_erlang_repo_url: "https://packages.erlang-solutions.com/{{ ansible_facts['distribution'] | lower }}"
+_rabbitmq_erlang_repo_url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/deb/{{ ansible_facts['distribution'] | lower }}"
 _rabbitmq_erlang_repo:
-  repo: "deb {{ rabbitmq_erlang_repo_url }} {{ ansible_facts['distribution_release'] | lower }} contrib"
+  repo: "deb {{ rabbitmq_erlang_repo_url }} {{ ansible_facts['distribution_release'] | lower }} main"
   state: "present"
   filename: els_erlang
 

vars/redhat.yml

@@ -17,21 +17,31 @@ _rabbitmq_install_method: external_repo
 _rabbitmq_package_version: 3.9.8-1
 _erlang_package_version: 24.1-1
 
-_rabbitmq_repo_url: "https://packagecloud.io/rabbitmq/rabbitmq-server/el/{{ ansible_facts['distribution_major_version'] }}/$basearch"
+# NOTE(noonedeadpunk): List of available packages can be searched here: https://cloudsmith.io/~rabbitmq/repos/
+
+_rabbitmq_repo_url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/rpm/el/{{ ansible_facts['distribution_major_version'] }}/noarch"
 _rabbitmq_repo:
   name: rabbitmq_rabbitmq-server
   description: "RabbitMQ Server Rolling Repository"
   baseurl: "{{ rabbitmq_repo_url }}"
   filename: RabbitMQ
+  gpgcheck: yes
+  gpgkey:
+    - https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-server/gpg.9F4587F226208342.key
+    - https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc
 
-_rabbitmq_erlang_repo_url: "https://packagecloud.io/rabbitmq/erlang/el/{{ ansible_facts['distribution_major_version'] }}/$basearch"
+_rabbitmq_erlang_repo_url: "https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/rpm/el/{{ ansible_facts['distribution_major_version'] }}/$basearch"
 _rabbitmq_erlang_repo:
   name: rabbitmq_els-erlang
-  description: "RabbitMQ Erlang Packages from Bintray"
+  description: "RabbitMQ Erlang Packages"
   baseurl: "{{ rabbitmq_erlang_repo_url }}"
   filename: els-erlang
+  gpgcheck: yes
+  gpgkey:
+    - https://dl.cloudsmith.io/public/rabbitmq/rabbitmq-erlang/gpg.E495BB49CC4BBE5B.key
+    - https://github.com/rabbitmq/signing-keys/releases/download/2.0/rabbitmq-release-signing-key.asc
 
 rabbitmq_distro_packages:
   - openssl
-  - "erlang-{{ _erlang_package_version }}.el{{ ansible_facts['distribution_major_version'] }}.x86_64"
+  - "erlang-{{ _erlang_package_version }}.el{{ ansible_facts['distribution_major_version'] }}.{{ ansible_facts['architecture'] }}"
   - "rabbitmq-server-{{ rabbitmq_package_version }}.el{{ ansible_facts['distribution_major_version'] }}.noarch"