Updated from OpenStack Ansible Tests

Change-Id: I430aa61cf483c70683517b1b751ffcb52a43b137

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 }}"