From b4d340c857864754d4b9904335ad51b14746b34b Mon Sep 17 00:00:00 2001 From: ZhijunWei Date: Sun, 19 Aug 2018 12:01:01 -0400 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: I2b89abfe09c9bd8386b83833b7f17eb388c7425f --- 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 55846d9..e3692b1 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -24,14 +24,14 @@ tags: - always -- include: zaqar_pre_install.yml -- include: zaqar_install.yml -- include: zaqar_post_install.yml +- include_tasks: zaqar_pre_install.yml +- include_tasks: zaqar_install.yml +- include_tasks: zaqar_post_install.yml -- include: zaqar_service_setup.yml +- include_tasks: zaqar_service_setup.yml run_once: yes -- include: "zaqar_{{ (zaqar_install_apache | bool) | ternary('apache', 'nginx') }}.yml" +- include_tasks: "zaqar_{{ (zaqar_install_apache | bool) | ternary('apache', 'nginx') }}.yml" - name: Flush handlers meta: flush_handlers diff --git a/tests/test.yml b/tests/test.yml index 7e2c67f..ff99668 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 Zaqar -- include: test-install-zaqar.yml +- import_playbook: test-install-zaqar.yml # Test Zaqar -- include: test-zaqar-functional.yml +- import_playbook: test-zaqar-functional.yml