X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tasks%2Fmain.yml;h=a9dc4d23896c56984d9a7cb5c9e270b7f613467e;hb=84d38251e016aebeb6fc72a5c76a486f0542212b;hp=bd82f932cd54b9f38dceb967c95166f3bded59d4;hpb=109c6b750751d1c5cd216ad2f09258cf512c4c9e;p=github%2Ffretlink%2Fansible-rabbitmq.git

diff --git a/tasks/main.yml b/tasks/main.yml
index bd82f93..a9dc4d2 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,21 +1,39 @@
+---
 # tasks file for ansible-rabbitmq
 - include: debian.yml
   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
+  stat:
+    path: /etc/rabbitmq/clustered
+  become: true
   register: clustered
 
 - include: rabbitmq_clustering.yml
-  when: rabbitmq_enable_clustering and (clustered.stat.exists != True)
+  when: >
+        rabbitmq_enable_clustering and
+        not clustered['stat']['exists']
+
+- include: rabbitmq_vhosts.yml
+  when: rabbitmq_extra_vhosts is defined
 
 - include: rabbitmq_ha_config.yml
-  when: rabbitmq_config_ha and rabbitmq_enable_clustering
+  when: >
+        rabbitmq_config_ha and
+        rabbitmq_enable_clustering and
+        rabbitmq_config is defined
 
 - include: rabbitmq_users.yml
+  when: rabbitmq_users is defined