From 748af51690520ed163c50425ccbad02dd1c2d4d2 Mon Sep 17 00:00:00 2001 From: caoyuan Date: Tue, 24 Jul 2018 18:58:20 +0800 Subject: [PATCH] use include_tasks instead of include include is marked as deprecated since ansible 2.4[0] [0] https://docs.ansible.com/ansible/2.4/include_module.html#deprecated Change-Id: I739fc1ce789c9db68687a2d2bf20d7567cd6cd3a --- tasks/main.yml | 10 +++++----- tests/test.yml | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index f3c370c..477b43c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -39,15 +39,15 @@ tags: - always -- include: designate_pre_install.yml +- include_tasks: designate_pre_install.yml tags: - designate-install -- include: designate_install.yml +- include_tasks: designate_install.yml tags: - designate-install -- include: designate_post_install.yml +- include_tasks: designate_post_install.yml tags: - designate-install - designate-config @@ -103,12 +103,12 @@ - name: Flush handlers meta: flush_handlers -- include: designate_db_setup.yml +- include_tasks: designate_db_setup.yml when: inventory_hostname == groups['designate_all'][0] tags: - designate-install -- include: designate_service_setup.yml +- include_tasks: designate_service_setup.yml when: inventory_hostname == groups['designate_all'][0] tags: - designate-install diff --git a/tests/test.yml b/tests/test.yml index 36147ae..bd522aa 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -14,19 +14,19 @@ # limitations under the License. # Setup the host -- include: common/test-setup-host.yml +- import_playbook: common/test-setup-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 Designate -- include: test-install-designate.yml +- import_playbook: test-install-designate.yml # Install and execute Tempest -- include: common/test-install-tempest.yml +- import_playbook: common/test-install-tempest.yml