3 files changed, 6 insertions, 6 deletions

diff --git a/tasks/main.yml b/tasks/main.yml
index 26abc8d..bd82f93 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -13,9 +13,9 @@
   register: clustered
 
 - include: rabbitmq_clustering.yml
-  when: enable_rabbitmq_clustering and (clustered.stat.exists != True)
+  when: rabbitmq_enable_clustering and (clustered.stat.exists != True)
 
 - include: rabbitmq_ha_config.yml
-  when: config_rabbitmq_ha and enable_rabbitmq_clustering
+  when: rabbitmq_config_ha and rabbitmq_enable_clustering
 
 - include: rabbitmq_users.yml
diff --git a/tasks/rabbitmq_clustering.yml b/tasks/rabbitmq_clustering.yml
index f9b5157..9dece46 100644
--- a/tasks/rabbitmq_clustering.yml
+++ b/tasks/rabbitmq_clustering.yml
@@ -12,13 +12,13 @@
 
 #- name: grabbing erlang cookie
 #  shell: cat /var/lib/rabbitmq/.erlang.cookie
-#  register: erlang_cookie
+#  register: rabbitmq_erlang_cookie
 #  when: inventory_hostname == "{{ rabbitmq_master }}"
 
 - name: rabbitmq_clustering | copy erlang cookie
   template:
     src: erlang.cookie.j2
-    dest: "{{ erlang_cookie_file }}"
+    dest: "{{ rabbitmq_erlang_cookie_file }}"
     owner: rabbitmq
     group: rabbitmq
     mode: 0400
diff --git a/tasks/rabbitmq_users.yml b/tasks/rabbitmq_users.yml
index 3e1997a..8bce8b2 100644
--- a/tasks/rabbitmq_users.yml
+++ b/tasks/rabbitmq_users.yml
@@ -10,7 +10,7 @@
     tags: "{{ item.tags }}"
     state: present
   with_items: "{{ rabbitmq_users }}"
-  when: (enable_rabbitmq_clustering is defined and not enable_rabbitmq_clustering) or enable_rabbitmq_clustering is not defined
+  when: (rabbitmq_enable_clustering is defined and not rabbitmq_enable_clustering) or rabbitmq_enable_clustering is not defined
 
 - name: rabbitmq_users | creating rabbitmq users
   rabbitmq_user:
@@ -24,4 +24,4 @@
     state: present
   run_once: yes
   with_items: "{{ rabbitmq_users }}"
-  when: (enable_rabbitmq_clustering is defined and enable_rabbitmq_clustering)
+  when: (rabbitmq_enable_clustering is defined and rabbitmq_enable_clustering)