From c8d576ee7131f5d91f0babdd96790351dd68c89e Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Mon, 19 Apr 2021 09:59:11 +0000
Subject: [PATCH] Updated from OpenStack Ansible Tests

Change-Id: I6143d9b2a4cc94b1e8aa89c53ac9431551f84529
---
 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 3e2a3634..f435f7db 100644
--- a/tasks/mq_setup.yml
+++ b/tasks/mq_setup.yml
@@ -68,7 +68,8 @@
         state: "present"
       when:
         - (_oslomsg_rpc_vhost is undefined) or
-          (_oslomsg_notify_vhost != _oslomsg_rpc_vhost)
+          (_oslomsg_notify_vhost != _oslomsg_rpc_vhost) or
+          (_oslomsg_notify_setup_host != _oslomsg_rpc_setup_host)
 
     - name: Apply Notify RabbitMQ vhost policies
       community.rabbitmq.rabbitmq_policy:
@@ -80,7 +81,8 @@
       loop: "{{ _oslomsg_notify_policies | default([]) + oslomsg_notify_policies }}"
       when:
         - (_oslomsg_rpc_vhost is undefined) or
-          (_oslomsg_notify_vhost != _oslomsg_rpc_vhost)
+          (_oslomsg_notify_vhost != _oslomsg_rpc_vhost) or
+          (_oslomsg_notify_setup_host != _oslomsg_rpc_setup_host)
 
     - name: Add Notify RabbitMQ user
       community.rabbitmq.rabbitmq_user:
@@ -95,7 +97,8 @@
       no_log: true
       when:
         - (_oslomsg_rpc_userid is undefined) or
-          (_oslomsg_notify_userid != _oslomsg_rpc_userid)
+          (_oslomsg_notify_userid != _oslomsg_rpc_userid) or
+          (_oslomsg_notify_setup_host != _oslomsg_rpc_setup_host)
 
 - name: Setup RPC MQ Service (Qdrouterd)
   delegate_to: "{{ _oslomsg_rpc_setup_host }}"