From 20f3ae971d37f3a26ee8aa079e2fd3e6d7ca43aa Mon Sep 17 00:00:00 2001 From: caoyuan Date: Tue, 24 Jul 2018 18:58:00 +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: Icbc1fab92895e1f70a2aedf9507491a1b789f205 --- tasks/main.yml | 10 +++++----- tests/test.yml | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 3dd8457..8749938 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -26,15 +26,15 @@ tags: - always -- include: congress_pre_install.yml +- include_tasks: congress_pre_install.yml tags: - congress-install -- include: congress_install.yml +- include_tasks: congress_install.yml tags: - congress-install -- include: congress_post_install.yml +- include_tasks: congress_post_install.yml tags: - congress-config @@ -84,13 +84,13 @@ - common-mq - congress-config -- include: congress_db_setup.yml +- include_tasks: congress_db_setup.yml when: - "inventory_hostname == ((groups['congress_all'] | intersect(ansible_play_hosts)) | list)[0]" tags: - congress-config -- include: congress_service_setup.yml +- include_tasks: congress_service_setup.yml when: - "inventory_hostname == ((groups['congress_all'] | intersect(ansible_play_hosts)) | list)[0]" tags: diff --git a/tests/test.yml b/tests/test.yml index fc6bcd5..1e997f7 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -14,13 +14,13 @@ # 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 # Install Congress -- include: test-install-congress.yml +- import_playbook: test-install-congress.yml