openstack/openstack-ansible-tests
Code Issues Proposed changes

Check for undefined _oslomsg_rpc variables

Browse Source 
Some services may make use of notifications but do not require rpc
messaging and have the _oslomsg_rpc variables undefined.

Update the when clauses on the tasks configuring RabbitMQ for
notifications to ignore undefined '_oslomsg_rpc_vhost' and
'_oslomsg_rpc_userid' variables.

Change-Id: I96e59b98e069bffb30c0d1851f777aa6b891f14f
This commit is contained in:
Jimmy McCrory 2019-06-11 10:41:47 -07:00
parent d06beae364
commit c8b921c668
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sync/tasks/mq_setup.yml
View File

@ -67,7 +67,8 @@
name: "{{ _oslomsg_notify_vhost }}" name: "{{ _oslomsg_notify_vhost }}"
state: "present" state: "present"
when: 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 - name: Apply Notify RabbitMQ vhost policies
rabbitmq_policy: rabbitmq_policy:
@ -78,7 +79,8 @@
vhost: "{{ _oslomsg_notify_vhost }}" vhost: "{{ _oslomsg_notify_vhost }}"
loop: "{{ _oslomsg_notify_policies | default([]) + oslomsg_notify_policies }}" loop: "{{ _oslomsg_notify_policies | default([]) + oslomsg_notify_policies }}"
when: when:
- _oslomsg_notify_vhost != _oslomsg_rpc_vhost - (_oslomsg_rpc_vhost is undefined) or
(_oslomsg_notify_vhost != _oslomsg_rpc_vhost)
- name: Add Notify RabbitMQ user - name: Add Notify RabbitMQ user
rabbitmq_user: rabbitmq_user:
@ -92,7 +94,8 @@
force: true force: true
no_log: true no_log: true
when: 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) - name: Setup RPC MQ Service (Qdrouterd)
delegate_to: "{{ _oslomsg_rpc_setup_host }}" delegate_to: "{{ _oslomsg_rpc_setup_host }}"