From aa49a67227a062b606ce14b363a709817921e68f Mon Sep 17 00:00:00 2001
From: ionutboangiu <ionut.boangiu@itsyscom.com>
Date: Mon, 15 May 2023 20:27:09 +0300
Subject: [PATCH] Revise install_rebbitmq role

---
 .../roles/install_rabbitmq/defaults/main.yaml |  4 ++-
 .../roles/install_rabbitmq/tasks/main.yaml    | 27 ++++++++++---------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/data/ansible/roles/install_rabbitmq/defaults/main.yaml b/data/ansible/roles/install_rabbitmq/defaults/main.yaml
index a1eb5d28d..139e1b399 100644
--- a/data/ansible/roles/install_rabbitmq/defaults/main.yaml
+++ b/data/ansible/roles/install_rabbitmq/defaults/main.yaml
@@ -1,7 +1,9 @@
 ---
-rabbitmq_dependencies:
+rabbitmq_dependencies: 
   - curl
   - gnupg
+  - debian-keyring
+  - debian-archive-keyring
   - apt-transport-https
 erlang_packages:
   - erlang-base
diff --git a/data/ansible/roles/install_rabbitmq/tasks/main.yaml b/data/ansible/roles/install_rabbitmq/tasks/main.yaml
index fa216f7b6..56d55c47e 100644
--- a/data/ansible/roles/install_rabbitmq/tasks/main.yaml
+++ b/data/ansible/roles/install_rabbitmq/tasks/main.yaml
@@ -1,5 +1,7 @@
+# tasks/main.yml
 ---
 - name: Install RabbitMQ dependencies
+  become: yes
   apt:
     name: "{{ rabbitmq_dependencies }}"
     state: present
@@ -7,21 +9,22 @@
     cache_valid_time: 86400
 
 - name: Import RabbitMQ's main signing key
-  apt_key:
-    url: "https://keys.openpgp.org/vks/v1/by-fingerprint/0A9AF2115F4687BD29803A206B73A36E6026DFCA"
-    state: present
+  become: yes
+  shell: |
+    curl -1sLf "https://keys.openpgp.org/vks/v1/by-fingerprint/0A9AF2115F4687BD29803A206B73A36E6026DFCA" | sudo gpg --dearmor | sudo tee /usr/share/keyrings/com.rabbitmq.team.gpg > /dev/null
 
-- name: Import Launchpad PPA that provides modern Erlang releases
-  apt_key:
-    url: "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xf77f1eda57ebb1cc"
-    state: present
+- name: Download Erlang GPG key
+  become: yes
+  shell: |
+    curl -1sLf "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xf77f1eda57ebb1cc" | sudo gpg --dearmor | sudo tee /usr/share/keyrings/net.launchpad.ppa.rabbitmq.erlang.gpg > /dev/null
 
 - name: Import PackageCloud RabbitMQ repository
-  apt_key:
-    url: "https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey"
-    state: present
+  become: yes
+  shell: |
+    curl -1sLf "https://packagecloud.io/rabbitmq/rabbitmq-server/gpgkey" | sudo gpg --dearmor | sudo tee /usr/share/keyrings/io.packagecloud.rabbitmq.gpg > /dev/null
 
 - name: Add apt repositories maintained by Team RabbitMQ
+  become: yes
   copy:
     dest: "/etc/apt/sources.list.d/rabbitmq.list"
     content: |
@@ -31,15 +34,15 @@
       deb-src [signed-by=/usr/share/keyrings/io.packagecloud.rabbitmq.gpg] https://packagecloud.io/rabbitmq/rabbitmq-server/ubuntu/ bionic main
 
 - name: Install Erlang packages
+  become: yes
   apt:
     name: "{{ erlang_packages }}"
     state: present
     update_cache: yes
-    cache_valid_time: 86400
 
 - name: Install rabbitmq-server and its dependencies
+  become: yes
   apt:
     name: rabbitmq-server
     state: present
     update_cache: yes
-    cache_valid_time: 86400