From 260ee0af3a9c86ad99757a46c7a33eae1b38f139 Mon Sep 17 00:00:00 2001 From: caoyuan Date: Tue, 24 Jul 2018 18:59:03 +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: I5f7873e7093e20544ca5c5addedf76b61a2f5d57 --- 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 b56d902e..10a6f885 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -47,15 +47,15 @@ tags: - always -- include: ceilometer_pre_install.yml +- include_tasks: ceilometer_pre_install.yml tags: - ceilometer-install -- include: ceilometer_install.yml +- include_tasks: ceilometer_install.yml tags: - ceilometer-install -- include: ceilometer_post_install.yml +- include_tasks: ceilometer_post_install.yml tags: - ceilometer-config @@ -86,7 +86,7 @@ - ceilometer-config - systemd-service -- include: ceilometer_service_setup.yml +- include_tasks: ceilometer_service_setup.yml when: - groups['ceilometer_central_container'] is defined and inventory_hostname == groups['ceilometer_central_container'][0] tags: @@ -109,7 +109,7 @@ - common-mq - ceilometer-config -- include: ceilometer_db_setup.yml +- include_tasks: ceilometer_db_setup.yml tags: - ceilometer-config run_once: true diff --git a/tests/test.yml b/tests/test.yml index 40ba558d..50a588ee 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -14,18 +14,18 @@ # 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 # Needed in order to run Ceilometer Tempest test -- include: common/test-install-glance.yml +- import_playbook: common/test-install-glance.yml -- include: test-install-ceilometer.yml +- import_playbook: test-install-ceilometer.yml # Install and execute Tempest -- include: common/test-install-tempest.yml +- import_playbook: common/test-install-tempest.yml