3 files changed, 31 insertions, 9 deletions

diff --git a/defaults/main.yml b/defaults/main.yml
index 9e9f3c8..4a09ac9 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -7,6 +7,9 @@ rabbitmq_config: []
   #   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
@@ -15,7 +18,12 @@ rabbitmq_config_service: false
 rabbitmq_config_file: 'etc/rabbitmq/rabbitmq.config.j2'
 
 rabbitmq_debian_repo: 'deb http://www.rabbitmq.com/debian/ testing main'
+#other repos
+#rabbitmq_debian_repo: deb https://dl.bintray.com/rabbitmq/debian {{ ansible_distribution_release }} main #bintray
 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
 
 # Defines if setting up a rabbitmq cluster
 rabbitmq_enable_clustering: false
diff --git a/tasks/debian.yml b/tasks/debian.yml
index b25d39b..f35bf55 100644
--- a/tasks/debian.yml
+++ b/tasks/debian.yml
@@ -9,14 +9,21 @@
   apt_repository:
     repo: "{{ rabbitmq_debian_repo }}"
     state: present
-  register: "rabbitmq_repo_added"
   become: true
 
-- name: debian | updating apt cache
-  apt:
-    update_cache: yes
+- name: debian | add Rabbitmq erlang repo key
+  apt_key:
+    url: https://bintray.com/user/downloadSubjectPublicKey?username=rabbitmq-erlang
+    state: present
+  become: true
+  when: rabbitmq_debian_erlang_from_rabbit
+
+- name: debian | add Rabbitmq erlang repo
+  apt_repository:
+    repo: deb https://dl.bintray.com/rabbitmq-erlang/debian {{ ansible_distribution_release }} erlang
+    state: present
   become: true
-  when: rabbitmq_repo_added.changed
+  when: rabbitmq_debian_erlang_from_rabbit
 
 - name: debian | installing RabbitMQ server
   apt:
@@ -24,7 +31,7 @@
     state: present
   become: true
   with_items:
-    - rabbitmq-server
+    - rabbitmq-server{{ (rabbitmq_debian_version is defined) | ternary(['=',rabbitmq_debian_version] | join(''),'')}}
 
 - name: debian | enabling the RabbitMQ Management Console
   rabbitmq_plugin:
diff --git a/tasks/rabbitmq_ha_config.yml b/tasks/rabbitmq_ha_config.yml
index ffda6e9..9ebe297 100644
--- a/tasks/rabbitmq_ha_config.yml
+++ b/tasks/rabbitmq_ha_config.yml
@@ -24,16 +24,23 @@
   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)