From 65598063b0a03b7009509983d80ae7a9c9dd2ef8 Mon Sep 17 00:00:00 2001 From: ZhijunWei Date: Sun, 19 Aug 2018 12:46:50 -0400 Subject: [PATCH] use include_tasks instead of include include is marked as deprecated since ansible 2.4[0] Switch to include_tasks or import_playbook as necessary [0] https://docs.ansible.com/ansible/2.4/include_module.html#deprecated Change-Id: I0fa8217c21b733f291e535cdd89de24eb6e0346d --- tasks/lxc_container_config.yml | 2 +- tests/test-containers-create.yml | 4 ++-- tests/test.yml | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tasks/lxc_container_config.yml b/tasks/lxc_container_config.yml index 026033c..dede90b 100644 --- a/tasks/lxc_container_config.yml +++ b/tasks/lxc_container_config.yml @@ -211,7 +211,7 @@ changed_when: wiring_script.rc == 3 delegate_to: "{{ physical_host }}" -- include: "lxc_container_network_new.yml" +- include_tasks: "lxc_container_network_new.yml" # VETH AND CONNECTIVITY SETTINGS diff --git a/tests/test-containers-create.yml b/tests/test-containers-create.yml index f214e3c..e878cc0 100644 --- a/tests/test-containers-create.yml +++ b/tests/test-containers-create.yml @@ -18,9 +18,9 @@ become: true gather_facts: true tasks: - - include: "common/common-tasks/test-set-nodepool-vars.yml" + - include_tasks: "common/common-tasks/test-set-nodepool-vars.yml" -- include: "common/destroy_containers.yml" +- import_playbook: "common/destroy_containers.yml" when: destroy_first | default(True) | bool - name: Playbook for creating containers diff --git a/tests/test.yml b/tests/test.yml index 74a2aa0..27412c2 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -14,19 +14,19 @@ # limitations under the License. # Create a zfs backend -- include: test-create-zfs-dev.yml +- import_playbook: test-create-zfs-dev.yml # Create a btrfs backend -- include: test-create-btrfs-dev.yml +- import_playbook: test-create-btrfs-dev.yml # Prepare the user ssh keys -- include: common/test-prepare-keys.yml +- import_playbook: common/test-prepare-keys.yml # Prepare the host -- include: common/test-prepare-host.yml +- import_playbook: common/test-prepare-host.yml # Create the containers -- include: test-containers-create.yml +- import_playbook: test-containers-create.yml # Test container creation -- include: test-containers-functional.yml +- import_playbook: test-containers-functional.yml