From 0227351d9f8d93369d3bfd09e8d49b4b27f5c9bc Mon Sep 17 00:00:00 2001
From: Dmitriy Rabotjagov <noonedeadpunk@ya.ru>
Date: Sat, 13 Apr 2019 08:59:49 +0300
Subject: [PATCH] Add rabbitmq policy configuration task

This patch adds support of rabbitmq policies configuration for mq_setup
and uses oslomsg_rpc_policies and oslomsg_notify_policies variables for
that. These variables are defined in group vars and provide HA mode.

It also adds ability to provide extra policies during include by
specifying _oslomsg_notify_policies and/or _oslomsg_rpc_policies
variables.

Depends-On: https://review.openstack.org/653409
Change-Id: Id60b7ac62ff16af938577615ab001dd144f92c26
(cherry picked from commit 68064c9ee74656b818e3382fa6b0da4f31b7a18c)
---
 sync/tasks/mq_setup.yml | 20 ++++++++++++++++++++
 test-vars.yml           | 10 ++++++++++
 2 files changed, 30 insertions(+)

diff --git a/sync/tasks/mq_setup.yml b/sync/tasks/mq_setup.yml
index fd4e0a76..e2ce8e28 100644
--- a/sync/tasks/mq_setup.yml
+++ b/sync/tasks/mq_setup.yml
@@ -33,6 +33,15 @@
         name: "{{ _oslomsg_rpc_vhost }}"
         state: "present"
 
+    - name: Apply RPC RabbitMQ vhost policies
+      rabbitmq_policy:
+        name: "{{ item.name }}"
+        pattern: "{{ item.pattern }}"
+        priority: "{{ item.priority | default(0) }}"
+        tags: "{{ item.tags }}"
+        vhost: "{{ _oslomsg_rpc_vhost }}"
+      loop: "{{ _oslomsg_rpc_policies | default([]) + oslomsg_rpc_policies }}"
+
     - name: Add RPC RabbitMQ user
       rabbitmq_user:
         user: "{{ _oslomsg_rpc_userid }}"
@@ -58,6 +67,17 @@
         name: "{{ _oslomsg_notify_vhost }}"
         state: "present"
 
+    - name: Apply Notify RabbitMQ vhost policies
+      rabbitmq_policy:
+        name: "{{ item.name }}"
+        pattern: "{{ item.pattern }}"
+        priority: "{{ item.priority | default(0) }}"
+        tags: "{{ item.tags }}"
+        vhost: "{{ _oslomsg_notify_vhost }}"
+      loop: "{{ _oslomsg_notify_policies | default([]) + oslomsg_notify_policies }}"
+      when:
+        - _oslomsg_notify_vhost != _oslomsg_rpc_vhost
+
     - name: Add Notify RabbitMQ user
       rabbitmq_user:
         user: "{{ _oslomsg_notify_userid }}"
diff --git a/test-vars.yml b/test-vars.yml
index be5e486a..282c7bae 100644
--- a/test-vars.yml
+++ b/test-vars.yml
@@ -98,6 +98,11 @@ oslomsg_rpc_servers: "{{ rabbitmq_servers }}"
 oslomsg_rpc_use_ssl: "{{ rabbitmq_use_ssl }}"
 oslomsg_rpc_host_group: "{{ test_rabbitmq_group }}"
 oslomsg_rpc_password: "{{ rabbitmq_password }}"
+oslomsg_rpc_policies:
+  - name: "HA"
+    pattern: '^(?!(amq\.)|(.*_fanout_)|(reply_)).*'
+    priority: 0
+    tags: "ha-mode=all"
 
 # Oslo Messaging Notify Settings
 oslomsg_notify_transport: rabbit
@@ -106,6 +111,11 @@ oslomsg_notify_servers: "{{ rabbitmq_servers }}"
 oslomsg_notify_use_ssl: "{{ rabbitmq_use_ssl }}"
 oslomsg_notify_host_group: "{{ test_rabbitmq_group }}"
 oslomsg_notify_password: "{{ rabbitmq_password }}"
+oslomsg_notify_policies:
+  - name: "HA"
+    pattern: '^(?!(amq\.)|(.*_fanout_)|(reply_)).*'
+    priority: 0
+    tags: "ha-mode=all"
 
 # Memcache Settings
 memcached_listen: "{{ test_memcached_host }}"