Bump rabbitmq version

This updates rabbitmq and erlang versions along with unifying approach
for focal and debian.

Change-Id: I51259a10b2e04cf533b776f34a6bc678e57f8c2a

vars/debian.yml

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 _rabbitmq_install_method: external_repo
-_rabbitmq_package_version: "3.8.9-1"
+_rabbitmq_package_version: "3.8.14-1"
 
 _rabbitmq_gpg_keys:
   - file: gpg/4D206F89
@@ -32,7 +32,7 @@ _rabbitmq_erlang_repo:
   state: "present"
   filename: els_erlang
 
-_rabbitmq_erlang_version_spec: "{{ (rabbitmq_install_method == 'external_repo') | ternary('1:22.3-1', '1:22.*') }}"
+_rabbitmq_erlang_version_spec: "{{ (rabbitmq_install_method == 'external_repo') | ternary('1:23.2.3-1', '1:22.*') }}"
 
 _rabbitmq_distro_dependencies:
   - "{{ (ansible_facts['architecture'] == 'aarch64') | ternary('erlang-base', 'erlang-base-hipe') }}"

vars/redhat.yml

@@ -14,7 +14,8 @@
 # limitations under the License.
 
 _rabbitmq_install_method: external_repo
-_rabbitmq_package_version: 3.8.9-1
+_rabbitmq_package_version: 3.8.14-1
+_erlang_package_version: 23.2.3-1
 
 _rabbitmq_repo_url: "https://packagecloud.io/rabbitmq/rabbitmq-server/el/{{ ansible_facts['distribution_major_version'] }}/$basearch"
 _rabbitmq_repo:
@@ -32,5 +33,5 @@ _rabbitmq_erlang_repo:
 
 rabbitmq_distro_packages:
   - openssl
-  - "erlang-22.3-1.el{{ ansible_distribution_major_version }}.x86_64"
+  - "erlang-{{ _erlang_package_version }}.el{{ ansible_distribution_major_version }}.x86_64"
   - "rabbitmq-server-{{ rabbitmq_package_version }}.el{{ ansible_distribution_major_version }}.noarch"

vars/ubuntu-20.04.yml

@@ -1,52 +0,0 @@
----
-# Copyright 2016, Walmart Stores, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# NOTE(jrosser) this is set to distro as there is no rabbitmq package currently for focal at packagecloud
-_rabbitmq_install_method: distro
-_rabbitmq_package_url: "https://packagecloud.io/rabbitmq/rabbitmq-server/packages/{{ ansible_facts['distribution'] | lower }}/{{ ansible_facts['distribution_release'] | lower }}/rabbitmq-server_3.8.2-1_all.deb/download.deb"
-_rabbitmq_package_version: "{{ _rabbitmq_package_url.split('/')[-2].split('_')[1] }}"
-_rabbitmq_release_version: "{{ _rabbitmq_package_version.split('-')[0] }}"
-_rabbitmq_package_sha256: "aebdb80be49fe3adbf99c859006d8a503f531be79a0cd0712a30341e4c72054f"
-_rabbitmq_package_path: "/opt/rabbitmq-server.deb"
-
-_rabbitmq_gpg_keys:
-  - file: gpg/4D206F89
-  - file: gpg/A14F4FCA
-
-_rabbitmq_repo_url: "https://packagecloud.io/rabbitmq/rabbitmq-server/{{ ansible_facts['distribution'] | lower }}"
-_rabbitmq_repo:
-  repo: "deb {{ rabbitmq_repo_url }} {{ ansible_facts['distribution_release'] | lower }} main"
-  # NOTE(jrosser) this is set to absent as there is no rabbitmq package currently for focal at packagecloud
-  state: "absent"
-  filename: "RabbitMQ"
-
-_rabbitmq_erlang_repo_url: "https://packages.erlang-solutions.com/{{ ansible_facts['distribution'] | lower }}"
-_rabbitmq_erlang_repo:
-  repo: "deb {{ rabbitmq_erlang_repo_url }} {{ ansible_facts['distribution_release'] | lower }} contrib"
-  # NOTE(jrosser) this is set to absent as there is no erlang package currently for focal at packagecloud
-  state: "absent"
-  filename: els_erlang
-
-_rabbitmq_erlang_version_spec: "1:22.*"
-
-rabbitmq_dependencies:
-  - "{{ (ansible_facts['architecture'] == 'aarch64') | ternary('erlang-base', 'erlang-base-hipe') }}"
-  - erlang-diameter
-  - erlang-eldap
-  - erlang-nox
-  - socat
-
-rabbitmq_distro_packages:
-  - rabbitmq-server