From e161e28b8486430186202ede49406936c9a64910 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Tue, 11 Jun 2019 22:17:35 +0000
Subject: [PATCH] Updated from OpenStack Ansible Tests

Change-Id: Ia0226bfdd85d5f316ae3ee1b16de921838357cd7
---
 tasks/mq_setup.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tasks/mq_setup.yml b/tasks/mq_setup.yml
index 4479809..fb9068e 100644
--- a/tasks/mq_setup.yml
+++ b/tasks/mq_setup.yml
@@ -67,7 +67,8 @@
         name: "{{ _oslomsg_notify_vhost }}"
         state: "present"
       when:
-        - _oslomsg_notify_vhost != _oslomsg_rpc_vhost
+        - (_oslomsg_rpc_vhost is undefined) or
+          (_oslomsg_notify_vhost != _oslomsg_rpc_vhost)
 
     - name: Apply Notify RabbitMQ vhost policies
       rabbitmq_policy:
@@ -78,7 +79,8 @@
         vhost: "{{ _oslomsg_notify_vhost }}"
       loop: "{{ _oslomsg_notify_policies | default([]) + oslomsg_notify_policies }}"
       when:
-        - _oslomsg_notify_vhost != _oslomsg_rpc_vhost
+        - (_oslomsg_rpc_vhost is undefined) or
+          (_oslomsg_notify_vhost != _oslomsg_rpc_vhost)
 
     - name: Add Notify RabbitMQ user
       rabbitmq_user:
@@ -92,7 +94,8 @@
         force: true
       no_log: true
       when:
-        - _oslomsg_notify_userid != _oslomsg_rpc_userid
+        - (_oslomsg_rpc_userid is undefined) or
+          (_oslomsg_notify_userid != _oslomsg_rpc_userid)
 
 - name: Setup RPC MQ Service (Qdrouterd)
   delegate_to: "{{ _oslomsg_rpc_setup_host }}"