From ecc8e31c1f0bd81767fea44356857a8ed666daae Mon Sep 17 00:00:00 2001 From: caoyuan Date: Tue, 24 Jul 2018 18:58:57 +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: Ief69dd0c2fe7397b75e9e4251f0cfb7040bcf95f --- 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 48d0dff..c2f78b8 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -41,15 +41,15 @@ tags: - always -- include: barbican_pre_install.yml +- include_tasks: barbican_pre_install.yml tags: - barbican-install -- include: barbican_install.yml +- include_tasks: barbican_install.yml tags: - barbican-install -- include: barbican_post_install.yml +- include_tasks: barbican_post_install.yml tags: - barbican-config @@ -99,13 +99,13 @@ - common-mq - barbican-config -- include: barbican_db_setup.yml +- include_tasks: barbican_db_setup.yml when: - inventory_hostname == groups['barbican_all'][0] tags: - barbican-config -- include: barbican_service_setup.yml +- include_tasks: barbican_service_setup.yml when: - inventory_hostname == groups['barbican_all'][0] tags: diff --git a/tests/test.yml b/tests/test.yml index ffed9ba..639bbf6 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 Barbican -- include: test-install-barbican.yml +- import_playbook: test-install-barbican.yml # Install Tempest -- include: common/test-install-tempest.yml +- import_playbook: common/test-install-tempest.yml