From f431b2262df573f1344eedb536e7a4c97401fe96 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Mon, 20 Aug 2018 10:49:52 +0000
Subject: [PATCH] Updated from OpenStack Ansible Tests

Change-Id: I4eb39382c377f772656728e1365fd466a636ac1b
---
 tasks/mq_setup.yml | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tasks/mq_setup.yml b/tasks/mq_setup.yml
index 64530afb..b5f47666 100644
--- a/tasks/mq_setup.yml
+++ b/tasks/mq_setup.yml
@@ -46,7 +46,7 @@
       no_log: true
 
 - name: Setup Notify MQ Service (RabbitMQ)
-  delegate_to: "{{ _oslomsg_rpc_setup_host }}"
+  delegate_to: "{{ _oslomsg_notify_setup_host }}"
   when:
     - "(_oslomsg_configure_notify | default(_oslomsg_notify_transport is defined))"
     - "(_oslomsg_notify_transport is defined) and (_oslomsg_notify_transport == 'rabbit')"
@@ -70,4 +70,14 @@
         force: true
       no_log: true
 
-# Note: Add the tasks for additional MQ servers here
+- name: Setup RPC MQ Service (Qdrouterd)
+  delegate_to: "{{ _oslomsg_rpc_setup_host }}"
+  when:
+    - "(_oslomsg_configure_rpc | default(_oslomsg_rpc_transport is defined))"
+    - "(_oslomsg_rpc_transport is defined) and (_oslomsg_rpc_transport == 'amqp')"
+  tags:
+    - common-qdrouterd
+  block:
+    - name: Add RPC Qdrouterd user
+      shell: "echo {{ _oslomsg_rpc_password }} | saslpasswd2 -c -p -f /var/lib/qdrouterd/qdrouterd.sasldb -u AMQP {{ _oslomsg_rpc_userid }}"
+      no_log: true