From deaee29ec3d681f126ff1fc809d9166caf77e6e5 Mon Sep 17 00:00:00 2001 From: caoyuan Date: Tue, 24 Jul 2018 18:58:13 +0800 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: I99486c136d34cda038ea3c2d543df4081178ce60 --- tasks/main.yml | 8 ++++---- tests/test.yml | 20 ++++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 825dd935..69bb217b 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -25,20 +25,20 @@ tags: - always -- include: tempest_install.yml +- include_tasks: tempest_install.yml tags: - tempest-install -- include: tempest_resources.yml +- include_tasks: tempest_resources.yml run_once: yes tags: - tempest-config -- include: tempest_post_install.yml +- include_tasks: tempest_post_install.yml tags: - tempest-config -- include: tempest_run.yml +- include_tasks: tempest_run.yml when: tempest_run | bool tags: - tempest-config diff --git a/tests/test.yml b/tests/test.yml index 52d74b87..25bc2466 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -14,31 +14,31 @@ # limitations under the License. # 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 # Prepare the containers -- include: common/test-prepare-containers.yml +- import_playbook: common/test-prepare-containers.yml # Install RabbitMQ/MariaDB -- include: common/test-install-infra.yml +- import_playbook: common/test-install-infra.yml # Install Keystone -- include: common/test-install-keystone.yml +- import_playbook: common/test-install-keystone.yml # Install Glance -- include: common/test-install-glance.yml +- import_playbook: common/test-install-glance.yml # Install Neutron -- include: common/test-install-neutron.yml +- import_playbook: common/test-install-neutron.yml # Install Nova -- include: common/test-install-nova.yml +- import_playbook: common/test-install-nova.yml # Install and execute Tempest -- include: common/test-install-tempest.yml +- import_playbook: common/test-install-tempest.yml # Check whether Tempest executed successfully -- include: test-tempest-functional.yml +- import_playbook: test-tempest-functional.yml