From 4e22d3b09b60a37702275ed6527f440765a811ae Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 19 Sep 2017 10:35:30 +0200
Subject: [PATCH] Replace deprecated "include" directive in Ansible 2.4
---
tasks/ec2/inithost.yml | 4 ++--
tasks/inithost.yml | 2 +-
tasks/main.yml | 4 ++--
tasks/removehost.yml | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tasks/ec2/inithost.yml b/tasks/ec2/inithost.yml
index 624bcda..6d02e2e 100644
--- a/tasks/ec2/inithost.yml
+++ b/tasks/ec2/inithost.yml
@@ -36,11 +36,11 @@
state: present
with_items: '{{ ec2.instance_ids }}'
- - include: inithostip.yml hostip='{{ inithostip }}'
+ - include_tasks: inithostip.yml hostip='{{ inithostip }}'
when: inithostip is defined
-- include: inithostip.yml hostip='{{ ec2instance.public_ip }}'
+- include_tasks: inithostip.yml hostip='{{ ec2instance.public_ip }}'
with_items: '{{ ec2.instances }}'
loop_control:
loop_var: ec2instance
diff --git a/tasks/inithost.yml b/tasks/inithost.yml
index 7c6ddac..aef9aba 100644
--- a/tasks/inithost.yml
+++ b/tasks/inithost.yml
@@ -1,4 +1,4 @@
---
# file: inithost.yml
-- include: "cleanup.yml"
+- include_tasks: "cleanup.yml"
diff --git a/tasks/main.yml b/tasks/main.yml
index e116fe9..a323610 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,8 +7,8 @@
- block:
- - include: "{{ cloud|default('none') }}/{{ mode }}.yml"
+ - include_tasks: "{{ cloud|default('none') }}/{{ mode }}.yml"
- - include: "{{ mode }}.yml"
+ - include_tasks: "{{ mode }}.yml"
when: '"cloud" not in excluded_roles'
diff --git a/tasks/removehost.yml b/tasks/removehost.yml
index e0f71e6..6ca0588 100644
--- a/tasks/removehost.yml
+++ b/tasks/removehost.yml
@@ -1,5 +1,5 @@
---
# file: removehost.yml
-- include: "cleanup.yml"
+- include_tasks: "cleanup.yml"
when: are_you_sure == "YES"
--
GitLab