From 0551f3f3430d26aac5aae1d1bb795deeeebe8a25 Mon Sep 17 00:00:00 2001 From: David Kirwan Date: Thu, 25 Apr 2024 11:58:40 +0100 Subject: [PATCH] zabbix: add clearer ansible tags on zabbix_template role tasks Signed-off-by: David Kirwan --- .../zabbix/zabbix_templates/tasks/add_hosts_to_hostgroups.yml | 1 + .../zabbix/zabbix_templates/tasks/add_templates_to_hosts.yml | 1 + roles/zabbix/zabbix_templates/tasks/hostgroups.yml | 3 ++- roles/zabbix/zabbix_templates/tasks/main.yml | 4 ++-- roles/zabbix/zabbix_templates/tasks/templates.yml | 1 + 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/roles/zabbix/zabbix_templates/tasks/add_hosts_to_hostgroups.yml b/roles/zabbix/zabbix_templates/tasks/add_hosts_to_hostgroups.yml index 0f75a6ed65..efbb13322e 100644 --- a/roles/zabbix/zabbix_templates/tasks/add_hosts_to_hostgroups.yml +++ b/roles/zabbix/zabbix_templates/tasks/add_hosts_to_hostgroups.yml @@ -9,6 +9,7 @@ with_items: "{{ zabbix_templates }}" tags: - zabbix_add_hosts_to_hostgroups + - zabbix_templates vars: ansible_zabbix_auth_key: "{{ (env == 'staging')|ternary(zabbix_stg_apikey, zabbix_apikey) }}" ansible_network_os: community.zabbix.zabbix diff --git a/roles/zabbix/zabbix_templates/tasks/add_templates_to_hosts.yml b/roles/zabbix/zabbix_templates/tasks/add_templates_to_hosts.yml index 60a4f2a736..72167598a5 100644 --- a/roles/zabbix/zabbix_templates/tasks/add_templates_to_hosts.yml +++ b/roles/zabbix/zabbix_templates/tasks/add_templates_to_hosts.yml @@ -8,6 +8,7 @@ with_items: "{{ zabbix_templates }}" tags: - zabbix_add_templates_to_hosts + - zabbix_templates vars: ansible_zabbix_auth_key: "{{ (env == 'staging')|ternary(zabbix_stg_apikey, zabbix_apikey) }}" ansible_network_os: community.zabbix.zabbix diff --git a/roles/zabbix/zabbix_templates/tasks/hostgroups.yml b/roles/zabbix/zabbix_templates/tasks/hostgroups.yml index f550e080cd..4dd6c92d2a 100644 --- a/roles/zabbix/zabbix_templates/tasks/hostgroups.yml +++ b/roles/zabbix/zabbix_templates/tasks/hostgroups.yml @@ -7,7 +7,8 @@ with_items: "{{ zabbix_templates }}" # Hostgroups specific to an ansible group can be overridden in inventory/group_vars/group_name run_once: True tags: - - zabbix_hostgroups + - zabbix_add_hostgroups + - zabbix_templates vars: ansible_zabbix_auth_key: "{{ (env == 'staging')|ternary(zabbix_stg_apikey, zabbix_apikey) }}" ansible_network_os: community.zabbix.zabbix diff --git a/roles/zabbix/zabbix_templates/tasks/main.yml b/roles/zabbix/zabbix_templates/tasks/main.yml index 82603d1dcd..fac0af82f3 100644 --- a/roles/zabbix/zabbix_templates/tasks/main.yml +++ b/roles/zabbix/zabbix_templates/tasks/main.yml @@ -1,7 +1,7 @@ --- - include_tasks: hostgroups.yml tags: - - zabbix_hostgroups + - zabbix_add_hostgroups - include_tasks: add_hosts_to_hostgroups.yml tags: @@ -9,7 +9,7 @@ - include_tasks: templates.yml tags: - - zabbix_templates + - zabbix_add_templates - include_tasks: add_templates_to_hosts.yml tags: diff --git a/roles/zabbix/zabbix_templates/tasks/templates.yml b/roles/zabbix/zabbix_templates/tasks/templates.yml index 1a36597a1d..2f215981dd 100644 --- a/roles/zabbix/zabbix_templates/tasks/templates.yml +++ b/roles/zabbix/zabbix_templates/tasks/templates.yml @@ -18,6 +18,7 @@ state: present with_items: "{{ zabbix_templates }}" # Templates specific to an ansible group, can be overwridden in inventory/group_vars/group_name tags: + - zabbix_add_templates - zabbix_templates vars: ansible_zabbix_auth_key: "{{ (env == 'staging')|ternary(zabbix_stg_apikey, zabbix_apikey) }}"