From b0c609f90eaabf7211b9d92b2ae50d6b316fd2de Mon Sep 17 00:00:00 2001 From: Jesse Pretorius Date: Fri, 27 Jul 2018 14:56:37 +0100 Subject: [PATCH] Use masakari-api group for setup tasks Rather than use the 'all' group, use the masakari-api group. This will becoe more important when the role extends to also apply to compute nodes. Co-Authored-By: Dmitriy R Change-Id: I434caf7d40385d481321c19748d91ecdcb6ae12e --- tasks/main.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index c0e3ff5..8254edf 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -43,7 +43,8 @@ - include_tasks: mq_setup.yml when: - - inventory_hostname == groups['masakari_all'][0] + - "masakari_services['masakari-api']['group'] in group_names" + - "inventory_hostname == ((groups[masakari_services['masakari-api']['group']] | intersect(ansible_play_hosts)) | list)[0]" with_items: - oslomsg_setup_host: "{{ masakari_oslomsg_rpc_setup_host }}" oslomsg_userid: "{{ masakari_oslomsg_rpc_userid }}" @@ -62,14 +63,14 @@ - include: masakari_db_setup.yml static: no when: - - inventory_hostname == groups['masakari_all'][0] - tags: - - masakari-config + - "masakari_services['masakari-api']['group'] in group_names" + - "inventory_hostname == ((groups[masakari_services['masakari-api']['group']] | intersect(ansible_play_hosts)) | list)[0]" - include: masakari_service_setup.yml static: no when: - - inventory_hostname == groups['masakari_all'][0] + - "masakari_services['masakari-api']['group'] in group_names" + - "inventory_hostname == ((groups[masakari_services['masakari-api']['group']] | intersect(ansible_play_hosts)) | list)[0]" tags: - masakari-config