4 files changed, 48 insertions, 24 deletions

diff --git a/tasks/debian.yml b/tasks/debian.yml
index f35bf55..c98ff68 100644
--- a/tasks/debian.yml
+++ b/tasks/debian.yml
@@ -4,12 +4,16 @@
     url: "{{ rabbitmq_debian_repo_key }}"
     state: present
   become: true
+  register: result
+  until: result is successful
 
 - name: debian | adding RabbitMQ repo
   apt_repository:
     repo: "{{ rabbitmq_debian_repo }}"
     state: present
   become: true
+  register: result
+  until: result is successful
 
 - name: debian | add Rabbitmq erlang repo key
   apt_key:
@@ -27,7 +31,7 @@
 
 - name: debian | installing RabbitMQ server
   apt:
-    name: "{{ item }}"
+    name: ['rabbitmq-server']
     state: present
   become: true
   with_items:
diff --git a/tasks/fedora.yml b/tasks/fedora.yml
index 6ac9c03..b09ced0 100644
--- a/tasks/fedora.yml
+++ b/tasks/fedora.yml
@@ -1,23 +1,27 @@
 ---
 - name: fedora | installing pre-reqs
   dnf:
-    name: "{{ item }}"
+    name: ['wget']
     state: present
   become: true
-  with_items:
-    - wget
+  register: result
+  until: result is successful
 
 - name: fedora | installing erlang
   dnf:
-    name: "erlang"
+    name: ['erlang']
     state: present
   become: true
+  register: result
+  until: result is successful
 
 - name: fedora | adding RabbitMQ public GPG key
   rpm_key:
     key: "{{ rabbitmq_redhat_repo_key }}"
     state: present
   become: true
+  register: result
+  until: result is successful
 
 - name: fedora | downloading RabbitMQ
   get_url:
@@ -30,12 +34,14 @@
     name: "/opt/{{ rabbitmq_redhat_package }}"
     state: present
   become: true
+  register: result
+  until: result is successful
 
 - name: fedora | starting and enabling RabbitMQ service
   service:
-    name: "rabbitmq-server"
+    name: rabbitmq-server
     state: started
-    enabled: yes
+    enabled: true
   become: true
 
 - name: fedora | enabling the RabbitMQ Management Console
diff --git a/tasks/rabbitmq_ha_config.yml b/tasks/rabbitmq_ha_config.yml
index 9ebe297..cc31333 100644
--- a/tasks/rabbitmq_ha_config.yml
+++ b/tasks/rabbitmq_ha_config.yml
@@ -4,21 +4,30 @@
     path: /usr/sbin/rabbitmqadmin
   register: rabbitmqadmin_check
 
-- name: rabbitmq_ha_config | install rabbitMQ admin
-  shell: wget http://guest:guest@localhost:15672/cli/rabbitmqadmin
+- name: rabbit_ha_config | Installing rabbitMQ admin
+  get_url:
+    url: http://guest:guest@localhost:15672/cli/rabbitmqadmin
+    dest: /usr/sbin/rabbitmqadmin
+    mode: u=rwx,g=rw,o=rw
   become: true
+  notify: restart rabbitmq-server
   when: not rabbitmqadmin_check['stat']['exists']
 
-- name: rabbitmq_ha_config | moving the rabbitMQ Admin
-  shell: mv rabbitmqadmin /usr/sbin
-  become: true
-  when: not rabbitmqadmin_check['stat']['exists']
+# - name: rabbitmq_ha_config | install rabbitMQ admin
+#   shell: wget http://guest:guest@localhost:15672/cli/rabbitmqadmin
+#   become: true
+#   when: not rabbitmqadmin_check['stat']['exists']
 
-- name: rabbitmq_ha_config | making executable rabbitMQ Admin
-  shell: chmod +x /usr/sbin/rabbitmqadmin
-  notify: restart rabbitmq-server
-  become: true
-  when: not rabbitmqadmin_check['stat']['exists']
+# - name: rabbitmq_ha_config | moving the rabbitMQ Admin
+#   shell: mv rabbitmqadmin /usr/sbin
+#   become: true
+#   when: not rabbitmqadmin_check['stat']['exists']
+
+# - name: rabbitmq_ha_config | making executable rabbitMQ Admin
+#   shell: chmod +x /usr/sbin/rabbitmqadmin
+#   notify: restart rabbitmq-server
+#   become: true
+#   when: not rabbitmqadmin_check['stat']['exists']
 
 - name: rabbitmq_ha_config | creating queue(s)
   command: rabbitmqadmin declare queue name={{ item['queue_name'] }} durable={{ item['durable']|lower }} --vhost={{ item['vhost'] | default('/') }}
diff --git a/tasks/redhat.yml b/tasks/redhat.yml
index afa714c..0c7b97a 100644
--- a/tasks/redhat.yml
+++ b/tasks/redhat.yml
@@ -1,24 +1,27 @@
 ---
 - name: redhat | installing pre-reqs
   yum:
-    name: "{{ item }}"
+    name: ['epel-release', 'wget']
     state: present
   become: true
-  with_items:
-    - epel-release
-    - wget
+  register: result
+  until: result is successful
 
 - name: redhat | installing erlang
   yum:
-    name: "erlang"
+    name: erlang
     state: present
   become: true
+  register: result
+  until: result is successful
 
 - name: redhat | adding RabbitMQ public GPG key
   rpm_key:
     key: "{{ rabbitmq_redhat_repo_key }}"
     state: present
   become: true
+  register: result
+  until: result is successful
 
 - name: redhat | downloading RabbitMQ
   get_url:
@@ -31,10 +34,12 @@
     name: "/opt/{{ rabbitmq_redhat_package }}"
     state: present
   become: true
+  register: result
+  until: result is successful
 
 - name: redhat | starting and enabling RabbitMQ service
   service:
-    name: "rabbitmq-server"
+    name: rabbitmq-server
     state: started
     enabled: yes
   become: true