From 5261ec8e989a8f4b268c45eda8556ca4eb358aa5 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/ec2/inithost.yml | 4 +---
tasks/inithost.yml | 3 +--
tasks/main.yml | 4 ++--
tasks/removehost.yml | 3 +--
4 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/tasks/ec2/inithost.yml b/tasks/ec2/inithost.yml
index c2f1c7d..599419c 100644
--- a/tasks/ec2/inithost.yml
+++ b/tasks/ec2/inithost.yml
@@ -36,8 +36,7 @@
state: present
with_items: '{{ ec2.instance_ids }}'
- - include_tasks: inithostip.yml hostip='{{ inithostip }}'
- tags: 'always'
+ - import_tasks: inithostip.yml hostip='{{ inithostip }}'
when: inithostip is defined
@@ -46,4 +45,3 @@
loop_control:
loop_var: ec2instance
when: inithostip is not defined
- tags: 'always'
diff --git a/tasks/inithost.yml b/tasks/inithost.yml
index f59433d..086e197 100644
--- a/tasks/inithost.yml
+++ b/tasks/inithost.yml
@@ -1,5 +1,4 @@
---
# file: inithost.yml
-- include_tasks: "cleanup.yml"
- tags: 'always'
+- import_tasks: "cleanup.yml"
diff --git a/tasks/main.yml b/tasks/main.yml
index 1d80e5e..e1ad6e4 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,8 +7,8 @@
- block:
- - include: "{{ cloud|default('none') }}/{{ mode }}.yml"
+ - import_tasks: "{{ cloud|default('none') }}/{{ mode }}.yml"
- - include: "{{ mode }}.yml"
+ - import_tasks: "{{ mode }}.yml"
when: '"cloud" not in excluded_roles'
diff --git a/tasks/removehost.yml b/tasks/removehost.yml
index 79eeebb..bab0816 100644
--- a/tasks/removehost.yml
+++ b/tasks/removehost.yml
@@ -1,6 +1,5 @@
---
# file: removehost.yml
-- include_tasks: "cleanup.yml"
+- import_tasks: "cleanup.yml"
when: are_you_sure == "YES"
- tags: 'always'
--
GitLab