X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=tasks%2Frabbitmq_users.yml;h=d09d624d7c3dcbb91b8305a13814577040d39c4d;hb=61381e23cfed992926f1f6b366c1409acc1439f7;hp=e14d390b339bb6debb94d9564325e94c1c8b40b4;hpb=93a297c59940c7cfe88afe0f9110af5b4be521e3;p=github%2Ffretlink%2Fansible-rabbitmq.git

diff --git a/tasks/rabbitmq_users.yml b/tasks/rabbitmq_users.yml
index e14d390..d09d624 100644
--- a/tasks/rabbitmq_users.yml
+++ b/tasks/rabbitmq_users.yml
@@ -1,27 +1,34 @@
 ---
 - name: rabbitmq_users | creating rabbitmq users
   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 }}"
+    name: "{{ item['name'] }}"
+    password: "{{ item['password'] }}"
+    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
-  with_items: rabbitmq_users
-  when: (enable_rabbitmq_clustering is defined and not enable_rabbitmq_clustering) or enable_rabbitmq_clustering is not defined
+  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_debian_version is version('3.7.9', '<')
 
-- name: rabbitmq_users | creating rabbitmq users
-  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 }}"
+- name: rabbitmq_users | creating rabbitmq users (rabbit >= 3.7.9)
+  rabbitmq_user_3_7_9:
+    name: "{{ item['name'] }}"
+    password: "{{ item['password'] }}"
+    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
-  with_items: rabbitmq_users
-  when: (enable_rabbitmq_clustering is defined and enable_rabbitmq_clustering)
+  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_debian_version is version('3.7.9', '>=')