From a7070cb3dd859a51606276e2d6d4b22233613986 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Sun, 25 Mar 2018 15:55:51 +0200
Subject: [PATCH] ansible-playbooks/general#72 Always use import_tasks or
include_tasks instead of just include
---
tasks/main.yml | 2 +-
tasks/serverdensity.yml | 9 +++------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/tasks/main.yml b/tasks/main.yml
index 2837ae3..70a60e6 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,7 +7,7 @@
- block:
- - include: serverdensity.yml
+ - import_tasks: serverdensity.yml
when: sd_api_token != ''
when: '"serverdensity" not in excluded_roles'
diff --git a/tasks/serverdensity.yml b/tasks/serverdensity.yml
index 45d1db8..8b51bb2 100644
--- a/tasks/serverdensity.yml
+++ b/tasks/serverdensity.yml
@@ -1,9 +1,8 @@
---
# file: roles/serverdensity/tasks/serverdensity.yml
-- include_tasks: uninstallv1.yml
+- import_tasks: uninstallv1.yml
when: sd_uninstallv1
- tags: 'always'
- name: "ServerDensity | Init SD plugin"
local_action:
@@ -59,10 +58,8 @@
when: sd_agent_key != ''
notify: "ServerDensity | Restart Agent"
-- include_tasks: apache.yml
+- import_tasks: apache.yml
when: sd_groups.apache != 'none' and inventory_hostname in groups[sd_groups.apache]
- tags: 'always'
-- include_tasks: mysql.yml
+- import_tasks: mysql.yml
when: sd_groups.mysql != 'none' and inventory_hostname in groups[sd_groups.mysql]
- tags: 'always'
--
GitLab