X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tasks%2Fmain.yml;h=8905c0b89108cdfa613e22384a57ecc6bb919753;hb=567573e86ad7a28961dd9e4086b3f1226c9ed0b0;hp=26abc8d915377004b32f03ad6b226aa19caef82d;hpb=2922c75a7fce9ba62d1d78a50bca7f14e707cd9d;p=github%2Ffretlink%2Fansible-rabbitmq.git

diff --git a/tasks/main.yml b/tasks/main.yml
index 26abc8d..8905c0b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,19 +3,32 @@
   when: ansible_os_family == "Debian"
 
 - include: redhat.yml
-  when: ansible_distribution == "CentOS" or ansible_distribution == "Red Hat Enterprise Linux"
+  when: >
+        ansible_distribution == "CentOS" or
+        ansible_distribution == "Red Hat Enterprise Linux" or
+        ansible_distribution == "OracleLinux"
 
 - include: fedora.yml
   when: ansible_distribution == "Fedora"
 
+- include: config.yml
+  when: rabbitmq_config_service
+
 - name: checking to see if already clustered
   stat: path=/etc/rabbitmq/clustered
+  become: true
   register: clustered
 
 - include: rabbitmq_clustering.yml
-  when: enable_rabbitmq_clustering and (clustered.stat.exists != True)
+  when: >
+        rabbitmq_enable_clustering and
+        not clustered['stat']['exists']
 
 - include: rabbitmq_ha_config.yml
-  when: config_rabbitmq_ha and enable_rabbitmq_clustering
+  when: >
+        rabbitmq_config_ha and
+        rabbitmq_enable_clustering and
+        rabbitmq_config is defined
 
 - include: rabbitmq_users.yml
+  when: rabbitmq_users is defined