From ffbad7224e9d2769f82ad515c76908f316d5f280 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Wed, 8 Nov 2017 10:57:28 +0100
Subject: [PATCH] ansible-playbooks/general#72 Replace include_tasks with
import_tasks
---
tasks/ec2/inithost.yml | 2 +-
tasks/inithost.yml | 2 +-
tasks/main.yml | 4 ++--
tasks/removehost.yml | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/tasks/ec2/inithost.yml b/tasks/ec2/inithost.yml
index b5aaebc..40b8494 100644
--- a/tasks/ec2/inithost.yml
+++ b/tasks/ec2/inithost.yml
@@ -36,7 +36,7 @@
state: present
with_items: '{{ ec2.instance_ids }}'
- - include_tasks: inithostip.yml hostip='{{ inithostip }}'
+ - import_tasks: inithostip.yml hostip='{{ inithostip }}'
when: inithostip is defined
diff --git a/tasks/inithost.yml b/tasks/inithost.yml
index aef9aba..086e197 100644
--- a/tasks/inithost.yml
+++ b/tasks/inithost.yml
@@ -1,4 +1,4 @@
---
# file: inithost.yml
-- include_tasks: "cleanup.yml"
+- import_tasks: "cleanup.yml"
diff --git a/tasks/main.yml b/tasks/main.yml
index a323610..4c7791b 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,8 +7,8 @@
- block:
- - include_tasks: "{{ cloud|default('none') }}/{{ mode }}.yml"
+ - import_tasks: "{{ cloud|default('none') }}/{{ mode }}.yml"
- - include_tasks: "{{ mode }}.yml"
+ - import_tasks: "{{ mode }}.yml"
when: '"cloud" not in excluded_roles'
diff --git a/tasks/removehost.yml b/tasks/removehost.yml
index 6ca0588..bab0816 100644
--- a/tasks/removehost.yml
+++ b/tasks/removehost.yml
@@ -1,5 +1,5 @@
---
# file: removehost.yml
-- include_tasks: "cleanup.yml"
+- import_tasks: "cleanup.yml"
when: are_you_sure == "YES"
--
GitLab