3 files changed, 36 insertions, 22 deletions

diff --git a/defaults/main.yml b/defaults/main.yml
index ff7d922..f3d2c20 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -1,12 +1,15 @@
 ---
 # defaults file for ansible-rabbitmq
 rabbitmq_config: []
-  # - queue_name: logstash
-  #   durable: true
-  #   exchange_name: logstash
-  #   type: direct
-  #   routing_key: logstash
-  #   tags: "ha-mode=all,ha-sync-mode=automatic"
+# - queue_name: logstash
+#   durable: true
+#   exchange_name: logstash
+#   type: direct
+#   routing_key: logstash
+#   tags: "ha-mode=all,ha-sync-mode=automatic"
+# - policy_pattern: ".*"
+#   vhost: apps
+#   tags: "ha-mode=all,ha-sync-mode=automatic"
 
 # Defines if rabbitmq ha should be configured
 rabbitmq_config_ha: false
@@ -20,7 +23,9 @@ rabbitmq_debian_repo: "deb https://dl.bintray.com/rabbitmq/debian {{ ansible_dis
 # rabbitmq_debian_repo_key: https://www.rabbitmq.com/rabbitmq-release-signing-key.asc
 rabbitmq_debian_repo_key: https://bintray.com/user/downloadSubjectPublicKey?username=rabbitmq
 rabbitmq_debian_erlang_from_rabbit: false
-rabbitmq_debian_version: 3.7.9 # current version if not defined
+
+# current version if not defined
+rabbitmq_debian_version: 3.7.9
 
 # Defines if setting up a rabbitmq cluster
 rabbitmq_enable_clustering: false
@@ -29,20 +34,21 @@ rabbitmq_erlang_cookie_file: /var/lib/rabbitmq/.erlang.cookie
 
 rabbitmq_listen_port: 5672
 rabbitmq_listeners: []
-  # - 127.0.0.1
-  # - '::1'
+# - 127.0.0.1
+# - '::1'
 
 rabbitmq_ssl_enable: false
 rabbitmq_ssl_port: 5671
 rabbitmq_ssl_listeners: []
-  # - '127.0.0.1'
-  # - '::1'
+# - 127.0.0.1
+# - "::1"
+
 rabitmq_ssl_options: {}
-  # cacertfile: '"/path/to/testca/cacert.pem"'
-  # certfile: '"/path/to/server/cert.pem"'
-  # keyfile: '"/path/to/server/key.pem"'
-  # verify: verify_peer
-  # fail_if_no_peer_cert: "false"
+# cacertfile: '"/path/to/testca/cacert.pem"'
+# certfile: '"/path/to/server/cert.pem"'
+# keyfile: '"/path/to/server/key.pem"'
+# verify: verify_peer
+# fail_if_no_peer_cert: "false"
 
 # Defines the inventory host that should be considered master
 rabbitmq_master: []
diff --git a/tasks/main.yml b/tasks/main.yml
index 3205473..1ef08f0 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,3 +1,4 @@
+---
 # tasks file for ansible-rabbitmq
 - include: debian.yml
   when: ansible_os_family == "Debian"
diff --git a/tasks/rabbitmq_ha_config.yml b/tasks/rabbitmq_ha_config.yml
index 0048b0c..cea301c 100644
--- a/tasks/rabbitmq_ha_config.yml
+++ b/tasks/rabbitmq_ha_config.yml
@@ -14,30 +14,37 @@
   when: not rabbitmqadmin_check['stat']['exists']
 
 - name: rabbitmq_ha_config | creating queue(s)
-  command: rabbitmqadmin declare queue name={{ item['queue_name'] }} durable={{ item['durable']|lower }}
+  command: rabbitmqadmin declare queue name={{ item['queue_name'] }} durable={{ item['durable']|lower }} --vhost={{ item['vhost'] | default('/') }}
   run_once: true
   become: true
+  when:
+    - item['queue_name'] is defined
   with_items: "{{ rabbitmq_config }}"
 
 - name: rabbitmq_ha_config | setting up ha on queue(s)
   rabbitmq_policy:
-    name: ha-all
-    pattern: "{{ item['queue_name'] }}"
-    tags: "{{ item['tags'] }}"
+    name: "ha-all{{ policy_name }}"
+    pattern: "{{ item.queue_name | default(item.policy_pattern) }}"
+    vhost: "{{ item.vhost | default('/') }}"
+    tags: "{{ item.tags }}"
     state: present
+  vars:
+    policy_vhost: "{{ item.vhost | default('/') }}"
+    policy_name: "{{ item.policy_pattern is defined | ternary(policy_vhost + item.policy_pattern|default(''),item.queue_name|default('')) }}"
   run_once: true
   become: true
+  when: item.queue_name is defined or item.policy_pattern is defined
   with_items: "{{ rabbitmq_config }}"
 
 - name: rabbitmq_ha_config | creating exchange(s)
-  command: rabbitmqadmin declare exchange name={{ item['exchange_name'] }} type={{ item['type'] }}
+  command: rabbitmqadmin declare exchange name={{ item['exchange_name'] }} type={{ item['type'] }} --vhost={{ item['vhost'] | default('/') }}
   run_once: true
   become: true
   with_items: "{{ rabbitmq_config }}"
   when: item['exchange_name'] is defined
 
 - name: rabbitmq_ha_config | creating binding(s)
-  command: rabbitmqadmin declare binding source={{ item['exchange_name'] }} destination_type="queue" destination={{ item['queue_name'] }} routing_key={{ item['routing_key'] }}
+  command: rabbitmqadmin declare binding source={{ item['exchange_name'] }} destination_type="queue" destination={{ item['queue_name'] }} routing_key={{ item['routing_key'] }} --vhost={{ item['vhost'] | default('/') }}
   run_once: true
   become: true
   with_items: "{{ rabbitmq_config }}"