From 5955660b7f14b25906a52bf025140ff884f3a532 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Wed, 8 Nov 2017 12:02:45 +0100
Subject: [PATCH] ansible-playbooks/general#72 All includes are now
include_tasks and they always have a tag associated
---
tasks/main.yml | 5 +++--
tasks/serverdensity.yml | 9 ++++++---
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/tasks/main.yml b/tasks/main.yml
index 9ba2fac..bc1f8b3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -3,11 +3,12 @@
- name: "ServerDensity Role"
set_fact: role_serverdensity_started=true
- tags: always
+ tags: 'always'
- block:
- - import_tasks: serverdensity.yml
+ - include_tasks: serverdensity.yml
when: sd_api_token != ''
+ tags: 'always'
when: '"serverdensity" not in excluded_roles'
diff --git a/tasks/serverdensity.yml b/tasks/serverdensity.yml
index 8b51bb2..45d1db8 100644
--- a/tasks/serverdensity.yml
+++ b/tasks/serverdensity.yml
@@ -1,8 +1,9 @@
---
# file: roles/serverdensity/tasks/serverdensity.yml
-- import_tasks: uninstallv1.yml
+- include_tasks: uninstallv1.yml
when: sd_uninstallv1
+ tags: 'always'
- name: "ServerDensity | Init SD plugin"
local_action:
@@ -58,8 +59,10 @@
when: sd_agent_key != ''
notify: "ServerDensity | Restart Agent"
-- import_tasks: apache.yml
+- include_tasks: apache.yml
when: sd_groups.apache != 'none' and inventory_hostname in groups[sd_groups.apache]
+ tags: 'always'
-- import_tasks: mysql.yml
+- include_tasks: mysql.yml
when: sd_groups.mysql != 'none' and inventory_hostname in groups[sd_groups.mysql]
+ tags: 'always'
--
GitLab