Merge remote-tracking branch 'gaetanfl/cluster_strategy' into fretlink-fixes

[github/fretlink/ansible-rabbitmq.git] / tasks / rabbitmq_users.yml

diff --git a/tasks/rabbitmq_users.yml b/tasks/rabbitmq_users.yml
index 083c70471016c94a87fea6126258500ec9d6fa18..d09d624d7c3dcbb91b8305a13814577040d39c4d 100644 (file)
--- a/tasks/rabbitmq_users.yml
+++ b/tasks/rabbitmq_users.yml
@@ -3,33 +3,32 @@
   rabbitmq_user:
     name: "{{ item['name'] }}"
     password: "{{ item['password'] }}"
-    vhost: "{{ item['vhost'] }}"
-    configure_priv: "{{ item['configure_priv'] }}"
-    read_priv: "{{ item['read_priv'] }}"
-    write_priv: "{{ item['write_priv'] }}"
-    tags: "{{ item['tags'] }}"
+    vhost: "{{ item['vhost']|default(omit) }}"
+    configure_priv: "{{ item['configure_priv']|default(omit) }}"
+    read_priv: "{{ item['read_priv']|default(omit) }}"
+    write_priv: "{{ item['write_priv']|default(omit) }}"
+    tags: "{{ item['tags']|default(omit) }}"
+    permissions: "{{ item['permissions']|default(omit) }}"
     state: present
+  run_once: rabbitmq_enable_clustering is defined and rabbitmq_enable_clustering
+  delegate_to: "{{ rabbitmq_master|default(omit) }}"
   become: true
   with_items: "{{ rabbitmq_users }}"
-  when: >
-        (rabbitmq_enable_clustering is defined and
-          not rabbitmq_enable_clustering) or
-          rabbitmq_enable_clustering is not defined
+  when: rabbitmq_debian_version is version('3.7.9', '<')
 
-- name: rabbitmq_users | creating rabbitmq users
-  rabbitmq_user:
+- name: rabbitmq_users | creating rabbitmq users (rabbit >= 3.7.9)
+  rabbitmq_user_3_7_9:
     name: "{{ item['name'] }}"
     password: "{{ item['password'] }}"
-    vhost: "{{ item['vhost'] }}"
-    configure_priv: "{{ item['configure_priv'] }}"
-    read_priv: "{{ item['read_priv'] }}"
-    write_priv: "{{ item['write_priv'] }}"
-    tags: "{{ item['tags'] }}"
+    vhost: "{{ item['vhost']|default(omit) }}"
+    configure_priv: "{{ item['configure_priv']|default(omit) }}"
+    read_priv: "{{ item['read_priv']|default(omit) }}"
+    write_priv: "{{ item['write_priv']|default(omit) }}"
+    tags: "{{ item['tags']|default(omit) }}"
+    permissions: "{{ item['permissions']|default(omit) }}"
     state: present
-  run_once: yes
-  delegate_to: "{{ rabbitmq_master }}"
+  run_once: rabbitmq_enable_clustering is defined and rabbitmq_enable_clustering
+  delegate_to: "{{ rabbitmq_master|default(omit) }}"
   become: true
   with_items: "{{ rabbitmq_users }}"
-  when: >
-        rabbitmq_enable_clustering is defined and
-          rabbitmq_enable_clustering
+  when: rabbitmq_debian_version is version('3.7.9', '>=')