From bfc6597b6ea3331164750f178e442051b95fa825 Mon Sep 17 00:00:00 2001 From: Major Hayden Date: Thu, 15 Feb 2018 10:25:02 -0600 Subject: [PATCH] Change include: to include_tasks: This removes warnings in Ansible 2.4+. The patch also removes the "static:" argument which is no longer used by Ansible. Change-Id: Iee7cd23ccd93e0f3a379fcd42dbd12ba3ee25cac --- meta/main.yml | 2 +- tasks/main.yml | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/meta/main.yml b/meta/main.yml index df73e2e9..d313b104 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -18,7 +18,7 @@ galaxy_info: description: Installation and setup of glance company: Rackspace license: Apache2 - min_ansible_version: 2.2 + min_ansible_version: 2.4 platforms: - name: Ubuntu versions: diff --git a/tasks/main.yml b/tasks/main.yml index db972e9a..87147c0e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -25,36 +25,34 @@ tags: - always -- include: glance_pre_install.yml +- include_tasks: glance_pre_install.yml tags: - glance-install -- include: glance_install.yml +- include_tasks: glance_install.yml tags: - glance-install -- include: glance_post_install.yml +- include_tasks: glance_post_install.yml tags: - glance-config -- include: "glance_init_{{ ansible_service_mgr }}.yml" +- include_tasks: "glance_init_{{ ansible_service_mgr }}.yml" tags: - glance-config -- include: glance_db_setup.yml - static: no +- include_tasks: glance_db_setup.yml when: - "glance_services['glance-api']['group'] in group_names" - "inventory_hostname == ((groups[glance_services['glance-api']['group']]| intersect(ansible_play_hosts)) | list)[0]" tags: - glance-config -- include: glance_uwsgi.yml +- include_tasks: glance_uwsgi.yml tags: - glance-config -- include: glance_service_setup.yml - static: no +- include_tasks: glance_service_setup.yml when: - "glance_services['glance-api']['group'] in group_names" - "inventory_hostname == ((groups[glance_services['glance-api']['group']]| intersect(ansible_play_hosts)) | list)[0]"