First commit of refactoring

3 files changed, 8 insertions, 19 deletions

diff --git a/tasks/debian.yml b/tasks/debian.yml
index c98ff68..317932e 100644
--- a/tasks/debian.yml
+++ b/tasks/debian.yml
@@ -20,6 +20,8 @@
     url: https://bintray.com/user/downloadSubjectPublicKey?username=rabbitmq-erlang
     state: present
   become: true
+  register: result
+  until: result is successful
   when: rabbitmq_debian_erlang_from_rabbit
 
 - name: debian | add Rabbitmq erlang repo
@@ -34,8 +36,10 @@
     name: ['rabbitmq-server']
     state: present
   become: true
+  register: result
+  until: result is successful
   with_items:
-    - rabbitmq-server{{ (rabbitmq_debian_version is defined) | ternary(['=',rabbitmq_debian_version] | join(''),'')}}
+    - rabbitmq-server{{ (rabbitmq_debian_version is defined) | ternary(['=',rabbitmq_debian_version] | join(''),'') }}
 
 - name: debian | enabling the RabbitMQ Management Console
   rabbitmq_plugin:
diff --git a/tasks/main.yml b/tasks/main.yml
index 8905c0b..3205473 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -15,7 +15,8 @@
   when: rabbitmq_config_service
 
 - name: checking to see if already clustered
-  stat: path=/etc/rabbitmq/clustered
+  stat:
+    path: /etc/rabbitmq/clustered
   become: true
   register: clustered
 
diff --git a/tasks/rabbitmq_ha_config.yml b/tasks/rabbitmq_ha_config.yml
index d3e4aa2..0048b0c 100644
--- a/tasks/rabbitmq_ha_config.yml
+++ b/tasks/rabbitmq_ha_config.yml
@@ -13,22 +13,6 @@
   notify: restart rabbitmq-server
   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 | 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 }}
   run_once: true
@@ -37,7 +21,7 @@
 
 - name: rabbitmq_ha_config | setting up ha on queue(s)
   rabbitmq_policy:
-    name: "ha-all"
+    name: ha-all
     pattern: "{{ item['queue_name'] }}"
     tags: "{{ item['tags'] }}"
     state: present