From 279609fe9164fe4cb15ed3f16bb2ccf50832aa40 Mon Sep 17 00:00:00 2001 From: caoyuan Date: Tue, 24 Jul 2018 18:58:46 +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: Ic3f98a2237ecd69d90818b6de4647481ed434698 --- tasks/main.yml | 10 +++++----- tasks/masakari_init_common.yml | 2 +- tests/test.yml | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 5b7a0fa..f94f8ac 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -25,19 +25,19 @@ tags: - always -- include: masakari_pre_install.yml +- include_tasks: masakari_pre_install.yml tags: - masakari-install -- include: masakari_install.yml +- include_tasks: masakari_install.yml tags: - masakari-install -- include: masakari_post_install.yml +- include_tasks: masakari_post_install.yml tags: - masakari-config -- include: masakari_init_common.yml +- include_tasks: masakari_init_common.yml tags: - masakari-config @@ -66,7 +66,7 @@ - "masakari_services['masakari-api']['group'] in group_names" - "inventory_hostname == ((groups[masakari_services['masakari-api']['group']] | intersect(ansible_play_hosts)) | list)[0]" -- include: masakari_service_setup.yml +- include_tasks: masakari_service_setup.yml static: no when: - "masakari_services['masakari-api']['group'] in group_names" diff --git a/tasks/masakari_init_common.yml b/tasks/masakari_init_common.yml index 86f1227..0258dba 100644 --- a/tasks/masakari_init_common.yml +++ b/tasks/masakari_init_common.yml @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: masakari_init_systemd.yml +- include_tasks: masakari_init_systemd.yml when: - ansible_service_mgr == 'systemd' diff --git a/tests/test.yml b/tests/test.yml index 7ed89ee..931aa69 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 Masakari -- include: test-install-masakari.yml +- import_playbook: test-install-masakari.yml # Test Masakari -- include: test-masakari-functional.yml +- import_playbook: test-masakari-functional.yml