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: If671a68bd26842dafb55996cdcb47bbb58e4a130

tasks/main.yml

@@ -36,23 +36,24 @@
   tags:
     - zun-install
 
-- include_tasks: mq_setup.yml
+- import_tasks: mq_setup.yml
   when:
     - "zun_services['zun-api']['group'] in group_names"
     - "inventory_hostname == ((groups[zun_services['zun-api']['group']] | intersect(ansible_play_hosts)) | list)[0]"
-  with_items:
+  vars:
-    - oslomsg_setup_host: "{{ zun_oslomsg_rpc_setup_host }}"
+    _oslomsg_rpc_setup_host: "{{ zun_oslomsg_rpc_setup_host }}"
-      oslomsg_userid: "{{ zun_oslomsg_rpc_userid }}"
+    _oslomsg_rpc_userid: "{{ zun_oslomsg_rpc_userid }}"
-      oslomsg_password: "{{ zun_oslomsg_rpc_password }}"
+    _oslomsg_rpc_password: "{{ zun_oslomsg_rpc_password }}"
-      oslomsg_vhost: "{{ zun_oslomsg_rpc_vhost }}"
+    _oslomsg_rpc_vhost: "{{ zun_oslomsg_rpc_vhost }}"
-      oslomsg_transport: "{{ zun_oslomsg_rpc_transport }}"
+    _oslomsg_rpc_transport: "{{ zun_oslomsg_rpc_transport }}"
-    - oslomsg_setup_host: "{{ zun_oslomsg_notify_setup_host }}"
+    _oslomsg_notify_setup_host: "{{ zun_oslomsg_notify_setup_host }}"
-      oslomsg_userid: "{{ zun_oslomsg_notify_userid }}"
+    _oslomsg_notify_userid: "{{ zun_oslomsg_notify_userid }}"
-      oslomsg_password: "{{ zun_oslomsg_notify_password }}"
+    _oslomsg_notify_password: "{{ zun_oslomsg_notify_password }}"
-      oslomsg_vhost: "{{ zun_oslomsg_notify_vhost }}"
+    _oslomsg_notify_vhost: "{{ zun_oslomsg_notify_vhost }}"
-      oslomsg_transport: "{{ zun_oslomsg_notify_transport }}"
+    _oslomsg_notify_transport: "{{ zun_oslomsg_notify_transport }}"
-  no_log: true
+    _oslomsg_configure_notify: "{{ (zun_ceilometer_enabled | bool) or (zun_designate_enabled | bool) }}"
   tags:
+    - common-mq
     - zun-config
 
 - include_tasks: zun_db_setup.yml

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)
+- name: Setup RPC MQ Service (RabbitMQ)
-  delegate_to: "{{ item.oslomsg_setup_host }}"
+  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 }}"
+        user: "{{ _oslomsg_rpc_userid }}"
-        password: "{{ item.oslomsg_password }}"
+        password: "{{ _oslomsg_rpc_password }}"
-        vhost: "{{ item.oslomsg_vhost }}"
+        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: ".*"