From 6065912f3e61c3ffff50b664d691bb65da599adb Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Sat, 13 Apr 2019 20:22:10 +0000
Subject: [PATCH] Updated from OpenStack Ansible Tests

Change-Id: Ie52ed02bf9f514cdf562468774c0b590e3cdc1f8
---
 tasks/mq_setup.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tasks/mq_setup.yml b/tasks/mq_setup.yml
index fd4e0a76..b8f9e453 100644
--- a/tasks/mq_setup.yml
+++ b/tasks/mq_setup.yml
@@ -57,6 +57,8 @@
       rabbitmq_vhost:
         name: "{{ _oslomsg_notify_vhost }}"
         state: "present"
+      when:
+        - _oslomsg_notify_vhost != _oslomsg_rpc_vhost
 
     - name: Add Notify RabbitMQ user
       rabbitmq_user:
@@ -69,6 +71,8 @@
         state: "present"
         force: true
       no_log: true
+      when:
+        - _oslomsg_notify_userid != _oslomsg_rpc_userid
 
 - name: Setup RPC MQ Service (Qdrouterd)
   delegate_to: "{{ _oslomsg_rpc_setup_host }}"