Merge "Allow tags to be used for MQ tasks"

This commit is contained in:
Zuul 2018-08-08 13:39:32 +00:00 committed by Gerrit Code Review
commit a3fa7c1971
2 changed files with 51 additions and 23 deletions

View File

@ -62,22 +62,22 @@
tags:
- watcher-install
- include_tasks: mq_setup.yml
- import_tasks: mq_setup.yml
when:
- inventory_hostname == groups['watcher_api'][0]
with_items:
- oslomsg_setup_host: "{{ watcher_oslomsg_rpc_setup_host }}"
oslomsg_userid: "{{ watcher_oslomsg_rpc_userid }}"
oslomsg_password: "{{ watcher_oslomsg_rpc_password }}"
oslomsg_vhost: "{{ watcher_oslomsg_rpc_vhost }}"
oslomsg_transport: "{{ watcher_oslomsg_rpc_transport }}"
- oslomsg_setup_host: "{{ watcher_oslomsg_notify_setup_host }}"
oslomsg_userid: "{{ watcher_oslomsg_notify_userid }}"
oslomsg_password: "{{ watcher_oslomsg_notify_password }}"
oslomsg_vhost: "{{ watcher_oslomsg_notify_vhost }}"
oslomsg_transport: "{{ watcher_oslomsg_notify_transport }}"
no_log: true
vars:
_oslomsg_rpc_setup_host: "{{ watcher_oslomsg_rpc_setup_host }}"
_oslomsg_rpc_userid: "{{ watcher_oslomsg_rpc_userid }}"
_oslomsg_rpc_password: "{{ watcher_oslomsg_rpc_password }}"
_oslomsg_rpc_vhost: "{{ watcher_oslomsg_rpc_vhost }}"
_oslomsg_rpc_transport: "{{ watcher_oslomsg_rpc_transport }}"
_oslomsg_notify_setup_host: "{{ watcher_oslomsg_notify_setup_host }}"
_oslomsg_notify_userid: "{{ watcher_oslomsg_notify_userid }}"
_oslomsg_notify_password: "{{ watcher_oslomsg_notify_password }}"
_oslomsg_notify_vhost: "{{ watcher_oslomsg_notify_vhost }}"
_oslomsg_notify_transport: "{{ watcher_oslomsg_notify_transport }}"
tags:
- common-mq
- watcher-config
- include: watcher_db_setup.yml

View File

@ -15,26 +15,54 @@
# WARNING:
# This file is maintained in the openstack-ansible-tests repository.
# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/sync/mq_setup.yml
# https://git.openstack.org/cgit/openstack/openstack-ansible-tests/tree/sync/tasks/mq_setup.yml
# If you need to modify this file, update the one in the openstack-ansible-tests
# repository. Once it merges there, the changes will automatically be proposed to
# all the repositories which use it.
- name: Setup MQ Service (RabbitMQ)
delegate_to: "{{ item.oslomsg_setup_host }}"
- name: Setup RPC MQ Service (RabbitMQ)
delegate_to: "{{ _oslomsg_rpc_setup_host }}"
when:
- "item.oslomsg_transport == 'rabbit'"
- "(_oslomsg_configure_rpc | default(_oslomsg_rpc_transport is defined))"
- "(_oslomsg_rpc_transport is defined) and (_oslomsg_rpc_transport == 'rabbit')"
tags:
- common-rabbitmq
block:
- name: Add RabbitMQ vhost
- name: Add RPC RabbitMQ vhost
rabbitmq_vhost:
name: "{{ item.oslomsg_vhost }}"
name: "{{ _oslomsg_rpc_vhost }}"
state: "present"
- name: Add RabbitMQ user
- name: Add RPC RabbitMQ user
rabbitmq_user:
user: "{{ item.oslomsg_userid }}"
password: "{{ item.oslomsg_password }}"
vhost: "{{ item.oslomsg_vhost }}"
user: "{{ _oslomsg_rpc_userid }}"
password: "{{ _oslomsg_rpc_password }}"
vhost: "{{ _oslomsg_rpc_vhost }}"
configure_priv: ".*"
read_priv: ".*"
write_priv: ".*"
state: "present"
force: true
no_log: true
- name: Setup Notify MQ Service (RabbitMQ)
delegate_to: "{{ _oslomsg_rpc_setup_host }}"
when:
- "(_oslomsg_configure_notify | default(_oslomsg_notify_transport is defined))"
- "(_oslomsg_notify_transport is defined) and (_oslomsg_notify_transport == 'rabbit')"
tags:
- common-rabbitmq
block:
- name: Add Notify RabbitMQ vhost
rabbitmq_vhost:
name: "{{ _oslomsg_notify_vhost }}"
state: "present"
- name: Add Notify RabbitMQ user
rabbitmq_user:
user: "{{ _oslomsg_notify_userid }}"
password: "{{ _oslomsg_notify_password }}"
vhost: "{{ _oslomsg_notify_vhost }}"
configure_priv: ".*"
read_priv: ".*"
write_priv: ".*"