aboutsummaryrefslogtreecommitdiffstats
path: root/resources/ansible_roles
diff options
context:
space:
mode:
authorzhihui wu <wu.zhihui1@zte.com.cn>2017-12-06 15:36:27 +0800
committerzhihui wu <wu.zhihui1@zte.com.cn>2018-01-09 15:54:49 +0800
commita9130ff7b0593a2e4d6fe3c84d44892b1c0a3340 (patch)
treea603bf5f7e983e56797432d3b77cf16c9be9906e /resources/ansible_roles
parent0436f87ff05b0835e1ed75ee2955f5097e572224 (diff)
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>
Diffstat (limited to 'resources/ansible_roles')
-rw-r--r--resources/ansible_roles/ceph-info/tasks/main.yml6
-rw-r--r--resources/ansible_roles/opnfv-testapi/tasks/main.yml2
-rw-r--r--resources/ansible_roles/qtip/tasks/generate-inventory.yml2
-rw-r--r--resources/ansible_roles/qtip/tasks/install-deps.yml2
-rw-r--r--resources/ansible_roles/qtip/tasks/main.yml2
-rw-r--r--resources/ansible_roles/qtip/tasks/setup-node.yml2
6 files changed, 8 insertions, 8 deletions
diff --git a/resources/ansible_roles/ceph-info/tasks/main.yml b/resources/ansible_roles/ceph-info/tasks/main.yml
index 04cc859c..cb10b4c1 100644
--- 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 270ffb59..334e06f4 100644
--- 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 aee25260..8aa36294 100644
--- 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 e9590f4b..81d054f6 100644
--- 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 270ffb59..334e06f4 100644
--- 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 af848f70..1fa7f9c4 100644
--- 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