From 427ab54f39899f2e4a86a8968edeeb9353beea9f Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotyagov <drabotyagov@vexxhost.com>
Date: Tue, 22 Oct 2019 16:11:36 +0300
Subject: [PATCH] Bump rabbitmq & erlang versions

Change-Id: Ibf87ccb4554ab7d765d542f5fae3cd857dbf5733
---
 tasks/rabbitmq_cluster.yml | 2 +-
 vars/debian.yml            | 8 +++++---
 vars/redhat.yml            | 8 +++++---
 vars/suse.yml              | 5 ++++-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/tasks/rabbitmq_cluster.yml b/tasks/rabbitmq_cluster.yml
index 30868288..ff661e4b 100644
--- a/tasks/rabbitmq_cluster.yml
+++ b/tasks/rabbitmq_cluster.yml
@@ -27,7 +27,7 @@
 # https://unix.stackexchange.com/a/13472
 - name: Get rabbitmq cluster name
   shell: |
-    rabbitmqctl -q cluster_status | paste -sd '' - | sed 's/ //g' | grep -oP '(?<={cluster_name,<<").*(?=">>})'
+    rabbitmqctl -q cluster_status | sed 's/ //g' | grep -oP '{{ _rabbitmq_release_version is version('3.8.0', '<') | ternary('(?<={cluster_name,<<").*(?=">>})', '(?<=Clustername:).*') }}'
   args:
     executable: /bin/bash
   changed_when: false
diff --git a/vars/debian.yml b/vars/debian.yml
index 21a4e318..3d598164 100644
--- a/vars/debian.yml
+++ b/vars/debian.yml
@@ -14,10 +14,10 @@
 # limitations under the License.
 
 _rabbitmq_install_method: file
-_rabbitmq_package_url: "https://packagecloud.io/rabbitmq/rabbitmq-server/packages/{{ ansible_distribution | lower }}/{{ ansible_distribution_release | lower }}/rabbitmq-server_3.7.19-1_all.deb/download.deb"
+_rabbitmq_package_url: "https://packagecloud.io/rabbitmq/rabbitmq-server/packages/{{ ansible_distribution | lower }}/{{ ansible_distribution_release | lower }}/rabbitmq-server_3.8.0-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: "c209540e797e2e1ebaccbb6173c89571990ffb3092e20f9d30fbb323acef4b5d"
+_rabbitmq_package_sha256: "53ee653c2cbf4c3f703afa4b58073e0d049881c7e66bc74e4f533f7a9042cc4d"
 _rabbitmq_package_path: "/opt/rabbitmq-server.deb"
 
 _rabbitmq_gpg_keys:
@@ -36,10 +36,12 @@ _rabbitmq_erlang_repo:
   state: "present"
   filename: els_erlang
 
-_rabbitmq_erlang_version_spec: "1:22.0*"
+_rabbitmq_erlang_version_spec: "1:22.1*"
 
 rabbitmq_dependencies:
   - "{{ (ansible_architecture == 'aarch64') | ternary('erlang-base', 'erlang-base-hipe') }}"
+  - erlang-diameter
+  - erlang-eldap
   - erlang-nox
   - socat
 
diff --git a/vars/redhat.yml b/vars/redhat.yml
index 464c084a..ea77d3d5 100644
--- a/vars/redhat.yml
+++ b/vars/redhat.yml
@@ -15,7 +15,9 @@
 
 _rabbitmq_install_method: external_repo
 
-_rabbitmq_package_version: ''
+_rabbitmq_package_version: 3.8.0-1
+_rabbitmq_release_version: "{{ rabbitmq_package_version.split('-')[0] }}"
+
 
 _rabbitmq_repo_url: "https://packagecloud.io/rabbitmq/rabbitmq-server/el/{{ ansible_distribution_major_version }}/$basearch"
 _rabbitmq_repo:
@@ -32,5 +34,5 @@ _rabbitmq_erlang_repo:
   filename: els-erlang
 
 rabbitmq_distro_packages:
-  - erlang-22.0.7-1.el7.x86_64
-  - rabbitmq-server-3.7.17-1.el7.noarch
+  - erlang-22.1.3-1.el7.x86_64
+  - "rabbitmq-server-{{ rabbitmq_package_version }}.el7.noarch"
diff --git a/vars/suse.yml b/vars/suse.yml
index 798d944d..e0c8b5b9 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -15,6 +15,9 @@
 
 _rabbitmq_install_method: distro
 
+_rabbitmq_package_version: 3.7.19
+_rabbitmq_release_version: "{{ rabbitmq_package_version }}"
+
 rabbitmq_distro_packages:
-  - rabbitmq-server
+  - "rabbitmq-server={{ rabbitmq_package_version }}"
   - rabbitmq-server-plugins