From 6170df0834034ea18f32820b523d3474226f078b 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: I0d5e63a6bb72ac292a27b677ef32a2f1daf47550 --- tasks/main.yml | 14 +++++++------- tests/test.yml | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index ef5f048..5bfaa39 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -47,15 +47,15 @@ tags: - always -- include: heat_pre_install.yml +- include_tasks: heat_pre_install.yml tags: - heat-install -- include: heat_install.yml +- include_tasks: heat_install.yml tags: - heat-install -- include: heat_post_install.yml +- include_tasks: heat_post_install.yml tags: - heat-config @@ -87,7 +87,7 @@ - heat-config - systemd-service -- include: heat_domain_setup.yml +- include_tasks: heat_domain_setup.yml static: no when: - "inventory_hostname == ansible_play_hosts[0]" @@ -113,18 +113,18 @@ tags: - heat-config -- include: heat_db_setup.yml +- include_tasks: heat_db_setup.yml static: no when: - "inventory_hostname == ansible_play_hosts[0]" tags: - heat-config -- include: heat_uwsgi.yml +- include_tasks: heat_uwsgi.yml tags: - heat-config -- include: heat_service_setup.yml +- include_tasks: heat_service_setup.yml static: no when: - "inventory_hostname == ansible_play_hosts[0]" diff --git a/tests/test.yml b/tests/test.yml index 866acbc..0a584a7 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -14,16 +14,16 @@ # 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 Heat -- include: common/test-install-heat.yml +- import_playbook: common/test-install-heat.yml # Test Heat -- include: test-heat-functional.yml +- import_playbook: test-heat-functional.yml