From a9455eb451f5da2429554a19e15edaa222fd179c Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Tue, 7 Aug 2018 15:01:40 +0100 Subject: [PATCH] Allow tags to be used for MQ tasks The use of 'include_tasks' and a loop of variables creates a situation where a user is unable to use tags to scope the inclusion of only the MQ tasks when running the playbooks. The use-case this is important for is when the rabbitmq containers are destroyed and rebuilt in order to resolve an issue with them, and the user wishes to quickly recreate all the vhosts/users. Ansible's 'include_tasks' is a dynamic inclusion, and dynamic inclusions are not included when using tags. The nice thing about dynamic inclusions is that they completely skip all tasks when the condition does not apply, cutting down deploy time. However, given the use-case, we should rather take on the extra deployment time. This patch changes the dynamic inclusion to a static one, adds a 'common-mq' tag to cover all MQ implementations, and re-implements the 'common-rabbitmq' tag for the tasks that relate to RabbitMQ specifically. It also implements conditionals for each task set so that the rpc/notify tasks can be skipped if a vhost/user is not required for that purpose (eg: swift does not use RPC, and most roles will not use notifications by default). Depends-On: https://review.openstack.org/588191 Change-Id: I077a267824b6142874d052d10227ea055abd6069 --- tasks/main.yml | 27 +++++++++++++------------- tasks/mq_setup.yml | 48 ++++++++++++++++++++++++++++++++++++---------- 2 files changed, 52 insertions(+), 23 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 01dcc75..c20aa4f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -43,23 +43,24 @@ tags: - sahara-config -- include_tasks: mq_setup.yml +- import_tasks: mq_setup.yml when: - "sahara_services['sahara-api']['group'] in group_names" - "inventory_hostname == ((groups[sahara_services['sahara-api']['group']]| intersect(ansible_play_hosts)) | list)[0]" - with_items: - - oslomsg_setup_host: "{{ sahara_oslomsg_rpc_setup_host }}" - oslomsg_userid: "{{ sahara_oslomsg_rpc_userid }}" - oslomsg_password: "{{ sahara_oslomsg_rpc_password }}" - oslomsg_vhost: "{{ sahara_oslomsg_rpc_vhost }}" - oslomsg_transport: "{{ sahara_oslomsg_rpc_transport }}" - - oslomsg_setup_host: "{{ sahara_oslomsg_notify_setup_host }}" - oslomsg_userid: "{{ sahara_oslomsg_notify_userid }}" - oslomsg_password: "{{ sahara_oslomsg_notify_password }}" - oslomsg_vhost: "{{ sahara_oslomsg_notify_vhost }}" - oslomsg_transport: "{{ sahara_oslomsg_notify_transport }}" - no_log: true + vars: + _oslomsg_rpc_setup_host: "{{ sahara_oslomsg_rpc_setup_host }}" + _oslomsg_rpc_userid: "{{ sahara_oslomsg_rpc_userid }}" + _oslomsg_rpc_password: "{{ sahara_oslomsg_rpc_password }}" + _oslomsg_rpc_vhost: "{{ sahara_oslomsg_rpc_vhost }}" + _oslomsg_rpc_transport: "{{ sahara_oslomsg_rpc_transport }}" + _oslomsg_notify_setup_host: "{{ sahara_oslomsg_notify_setup_host }}" + _oslomsg_notify_userid: "{{ sahara_oslomsg_notify_userid }}" + _oslomsg_notify_password: "{{ sahara_oslomsg_notify_password }}" + _oslomsg_notify_vhost: "{{ sahara_oslomsg_notify_vhost }}" + _oslomsg_notify_transport: "{{ sahara_oslomsg_notify_transport }}" + _oslomsg_configure_notify: "{{ sahara_ceilometer_enabled | bool }}" tags: + - common-mq - sahara-config - include: sahara_db_setup.yml diff --git a/tasks/mq_setup.yml b/tasks/mq_setup.yml index 2ef034a..64530af 100644 --- a/tasks/mq_setup.yml +++ b/tasks/mq_setup.yml @@ -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: ".*"