From 15c0163b1ea45e38a7ac51f019badb61de7a2693 Mon Sep 17 00:00:00 2001 From: caoyuan Date: Tue, 24 Jul 2018 18:29:55 +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: I0297ca2a66b3344cfc20a1adf81b71339174a205 --- tasks/main.yml | 8 ++++---- tests/test.yml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 823438f..89ed84f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -39,11 +39,11 @@ tags: - always -- include: cloudkitty_pre_install.yml -- include: cloudkitty_install.yml -- include: cloudkitty_post_install.yml +- include_tasks: cloudkitty_pre_install.yml +- include_tasks: cloudkitty_install.yml +- include_tasks: cloudkitty_post_install.yml -- include: cloudkitty_service_setup.yml +- include_tasks: cloudkitty_service_setup.yml when: inventory_hostname == groups['cloudkitty_all'][0] - import_tasks: mq_setup.yml diff --git a/tests/test.yml b/tests/test.yml index 8d6d5b5..b692e45 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -14,12 +14,12 @@ # limitations under the License. # Setup the host -- include: common/test-setup-host.yml +- import_playbook: common/test-setup-host.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 -- include: test-install-cloudkitty.yml +- import_playbook: test-install-cloudkitty.yml