use 'import_tasks' and 'include_tasks' instead of 'include'

The use of 'include' for tasks has been deprecated.[1]

[1] http://docs.ansible.com/ansible/latest/include_module.html

Change-Id: I940f4031b16860e69d2ca92e4fca82c5cc495aef
Signed-off-by: zhihui wu <wu.zhihui1@zte.com.cn>

diff --git a/resources/ansible_roles/ceph-info/tasks/main.yml b/resources/ansible_roles/ceph-info/tasks/main.yml
index 04cc859..cb10b4c 100644 (file)
--- a/resources/ansible_roles/ceph-info/tasks/main.yml
+++ b/resources/ansible_roles/ceph-info/tasks/main.yml
@@ -9,6 +9,6 @@
 
 ---
 
-- include: cache.yml
-- include: disk.yml
-- include: network.yml
+- import_tasks: cache.yml
+- import_tasks: disk.yml
+- import_tasks: network.yml

diff --git a/resources/ansible_roles/opnfv-testapi/tasks/main.yml b/resources/ansible_roles/opnfv-testapi/tasks/main.yml
index 270ffb5..334e06f 100644 (file)
--- a/resources/ansible_roles/opnfv-testapi/tasks/main.yml
+++ b/resources/ansible_roles/opnfv-testapi/tasks/main.yml
@@ -9,4 +9,4 @@
 
 ---
 
-- include: "{{ tasks }}.yml"
+- include_tasks: "{{ tasks }}.yml"

diff --git a/resources/ansible_roles/qtip/tasks/generate-inventory.yml b/resources/ansible_roles/qtip/tasks/generate-inventory.yml
index aee2526..8aa3629 100644 (file)
--- a/resources/ansible_roles/qtip/tasks/generate-inventory.yml
+++ b/resources/ansible_roles/qtip/tasks/generate-inventory.yml
@@ -11,7 +11,7 @@
 
 ---
 
-- include: "gather-facts-{{ installer_type }}.yml"
+- include_tasks: "gather-facts-{{ installer_type }}.yml"
 
 - name: generating inventory file
   template: src=templates/hosts dest=./hosts

diff --git a/resources/ansible_roles/qtip/tasks/install-deps.yml b/resources/ansible_roles/qtip/tasks/install-deps.yml
index e9590f4..81d054f 100644 (file)
--- a/resources/ansible_roles/qtip/tasks/install-deps.yml
+++ b/resources/ansible_roles/qtip/tasks/install-deps.yml
@@ -8,4 +8,4 @@
 ##############################################################################
 
 ---
-- include: "install-deps-{{ ansible_os_family|lower }}.yml"
+- include_tasks: "install-deps-{{ ansible_os_family|lower }}.yml"

diff --git a/resources/ansible_roles/qtip/tasks/main.yml b/resources/ansible_roles/qtip/tasks/main.yml
index 270ffb5..334e06f 100644 (file)
--- a/resources/ansible_roles/qtip/tasks/main.yml
+++ b/resources/ansible_roles/qtip/tasks/main.yml
@@ -9,4 +9,4 @@
 
 ---
 
-- include: "{{ tasks }}.yml"
+- include_tasks: "{{ tasks }}.yml"

diff --git a/resources/ansible_roles/qtip/tasks/setup-node.yml b/resources/ansible_roles/qtip/tasks/setup-node.yml
index af848f7..1fa7f9c 100644 (file)
--- a/resources/ansible_roles/qtip/tasks/setup-node.yml
+++ b/resources/ansible_roles/qtip/tasks/setup-node.yml
@@ -26,4 +26,4 @@
     path: "{{ qtip_workdir }}"
     state: directory
 
-- include: install-deps.yml
+- import_tasks: install-deps.yml