Merge "Updated from OpenStack Ansible Tests"

This commit is contained in:
Zuul 2019-06-12 07:56:51 +00:00 committed by Gerrit Code Review
commit bffb587002

View File

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