Merge "Use include_tasks instead of include"

ansible/roles/aodh/tasks/bootstrap.yml

@@ -32,5 +32,5 @@
   when:
     - not use_preconfigured_databases | bool
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
   when: database.changed or use_preconfigured_databases | bool

ansible/roles/aodh/tasks/deploy.yml

@@ -1,17 +1,17 @@
 ---
-- include: register.yml
+- include_tasks: register.yml
   when: inventory_hostname in groups['aodh-api']
 
-- include: config.yml
+- include_tasks: config.yml
   when: inventory_hostname in groups['aodh-api'] or
         inventory_hostname in groups['aodh-evaluator'] or
         inventory_hostname in groups['aodh-listener'] or
         inventory_hostname in groups['aodh-notifier']
 
-- include: clone.yml
+- include_tasks: clone.yml
   when: aodh_dev_mode | bool
 
-- include: bootstrap.yml
+- include_tasks: bootstrap.yml
   when: inventory_hostname in groups['aodh-api']
 
 - name: Flush handlers

ansible/roles/aodh/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/aodh/tasks/reconfigure.yml

@@ -1,2 +1,2 @@
 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/aodh/tasks/upgrade.yml

@@ -1,7 +1,7 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/barbican/tasks/bootstrap.yml

@@ -32,5 +32,5 @@
   when:
     - not use_preconfigured_databases | bool
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
   when: database.changed or use_preconfigured_databases | bool

ansible/roles/barbican/tasks/deploy.yml

@@ -1,16 +1,16 @@
 ---
-- include: register.yml
+- include_tasks: register.yml
   when: inventory_hostname in groups['barbican-api']
 
-- include: config.yml
+- include_tasks: config.yml
   when: inventory_hostname in groups['barbican-api'] or
         inventory_hostname in groups['barbican-worker'] or
         inventory_hostname in groups['barbican-keystone-listener']
 
-- include: clone.yml
+- include_tasks: clone.yml
   when: barbican_dev_mode | bool
 
-- include: bootstrap.yml
+- include_tasks: bootstrap.yml
   when: inventory_hostname in groups['barbican-api']
 
 - name: Flush handlers

ansible/roles/barbican/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/barbican/tasks/reconfigure.yml

@@ -1,2 +1,2 @@
 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/barbican/tasks/upgrade.yml

@@ -1,7 +1,7 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/baremetal/tasks/bootstrap-servers.yml

@@ -1,6 +1,6 @@
 ---
-- include: pre-install.yml
+- include_tasks: pre-install.yml
 
-- include: install.yml
+- include_tasks: install.yml
 
-- include: post-install.yml
+- include_tasks: post-install.yml

ansible/roles/baremetal/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/bifrost/tasks/deploy.yml

@@ -1,6 +1,6 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
-- include: start.yml
+- include_tasks: start.yml
 
-- include: bootstrap.yml
+- include_tasks: bootstrap.yml

ansible/roles/bifrost/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/bifrost/tasks/reconfigure.yml

@@ -10,7 +10,7 @@
   with_items:
     - { name: bifrost-deploy, group: bifrost-deploy }
 
-- include: config.yml
+- include_tasks: config.yml
 
 - name: Check the configs
   command: docker exec {{ item.name }} /usr/local/bin/kolla_set_configs --check
@@ -49,7 +49,7 @@
     - "{{ container_envs.results }}"
     - "{{ check_results.results }}"
 
-- include: start.yml
+- include_tasks: start.yml
   when: remove_containers.changed
 
 - name: Restart containers

ansible/roles/bifrost/tasks/upgrade.yml

@@ -1,4 +1,4 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
-- include: start.yml
+- include_tasks: start.yml

ansible/roles/blazar/tasks/bootstrap.yml

@@ -50,5 +50,5 @@
   run_once: True
   delegate_to: "{{ groups['blazar-api'][0] }}"
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
   when: database.changed

ansible/roles/blazar/tasks/deploy.yml

@@ -1,15 +1,15 @@
 ---
-- include: register.yml
+- include_tasks: register.yml
   when: inventory_hostname in groups['blazar-api']
 
-- include: config.yml
+- include_tasks: config.yml
   when: inventory_hostname in groups['blazar-api'] or
         inventory_hostname in groups['blazar-manager']
 
-- include: clone.yml
+- include_tasks: clone.yml
   when: blazar_dev_mode | bool
 
-- include: bootstrap.yml
+- include_tasks: bootstrap.yml
   when: inventory_hostname in groups['blazar-api']
 
 - name: Flush handlers

ansible/roles/blazar/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/blazar/tasks/reconfigure.yml

@@ -1,2 +1,2 @@
 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/blazar/tasks/upgrade.yml

@@ -1,7 +1,7 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/ceilometer/tasks/bootstrap.yml

@@ -1,3 +1,3 @@
 ---
 # TODO(Jeffrey4l): fix idempotent
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml

ansible/roles/ceilometer/tasks/deploy.yml

@@ -1,15 +1,15 @@
 ---
-- include: register.yml
+- include_tasks: register.yml
   when: inventory_hostname in groups['ceilometer']
 
-- include: config.yml
+- include_tasks: config.yml
   when: inventory_hostname in groups['ceilometer'] or
         inventory_hostname in groups['compute']
 
-- include: clone.yml
+- include_tasks: clone.yml
   when: ceilometer_dev_mode | bool
 
-- include: bootstrap.yml
+- include_tasks: bootstrap.yml
   when: inventory_hostname in groups['ceilometer']
 
 - name: Flush handlers

ansible/roles/ceilometer/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/ceilometer/tasks/reconfigure.yml

@@ -1,2 +1,2 @@
 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/ceilometer/tasks/upgrade.yml

@@ -1,7 +1,7 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/ceph/tasks/bootstrap_mons.yml

@@ -35,5 +35,5 @@
   check_mode: no
   run_once: True
 
-- include: generate_cluster.yml
+- include_tasks: generate_cluster.yml
   when: delegate_host == 'None' and inventory_hostname == groups['ceph-mon'][0]

ansible/roles/ceph/tasks/deploy.yml

@@ -1,23 +1,23 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
-- include: bootstrap_mons.yml
+- include_tasks: bootstrap_mons.yml
   when: inventory_hostname in groups['ceph-mon']
 
-- include: distribute_keyrings.yml
+- include_tasks: distribute_keyrings.yml
 
-- include: start_mons.yml
+- include_tasks: start_mons.yml
   when: inventory_hostname in groups['ceph-mon']
 
-- include: start_mgrs.yml
+- include_tasks: start_mgrs.yml
   when: inventory_hostname in groups['ceph-mgr']
 
-- include: start_ceph_dashboard.yml
+- include_tasks: start_ceph_dashboard.yml
   when:
     - enable_ceph_dashboard | bool
     - inventory_hostname in groups['ceph-mon']
 
-- include: start_nfss.yml
+- include_tasks: start_nfss.yml
   when:
     - enable_ceph_nfs | bool
     - inventory_hostname in groups['ceph-nfs']
@@ -29,23 +29,23 @@
   run_once: True
   delegate_to: "{{ groups['ceph-mon'][0] }}"
 
-- include: bootstrap_osds.yml
+- include_tasks: bootstrap_osds.yml
   when: inventory_hostname in groups['ceph-osd']
 
-- include: start_osds.yml
+- include_tasks: start_osds.yml
   when: inventory_hostname in groups['ceph-osd']
 
-- include: start_rgws.yml
+- include_tasks: start_rgws.yml
   when:
     - enable_ceph_rgw | bool
     - inventory_hostname in groups['ceph-rgw']
 
-- include: start_rgw_keystone.yml
+- include_tasks: start_rgw_keystone.yml
   when:
     - enable_ceph_rgw_keystone | bool
     - inventory_hostname in groups['ceph-rgw']
 
-- include: start_mdss.yml
+- include_tasks: start_mdss.yml
   when:
     - enable_ceph_mds | bool
     - inventory_hostname in groups['ceph-mds']

ansible/roles/ceph/tasks/generate_cluster.yml

@@ -22,7 +22,7 @@
       - "ceph_mon_config:/etc/ceph"
       - "kolla_logs:/var/log/kolla/"
 
-- include: start_mons.yml
+- include_tasks: start_mons.yml
 
 - name: Setting host for cluster files
   set_fact:

ansible/roles/ceph/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/ceph/tasks/reconfigure.yml

@@ -55,7 +55,7 @@
   with_items:
     - { name: ceph_rgw, group: ceph-rgw }
 
-- include: config.yml
+- include_tasks: config.yml
 
 - name: Check the configs in ceph_mon container
   command: docker exec {{ item.name }} /usr/local/bin/kolla_set_configs --check
@@ -165,17 +165,17 @@
     - "{{ ceph_rgw_container_envs.results }}"
     - "{{ ceph_rgw_check_results.results }}"
 
-- include: start_mons.yml
+- include_tasks: start_mons.yml
   when:
     - inventory_hostname in groups['ceph-mon']
     - remove_ceph_mon_container.changed
 
-- include: start_osds.yml
+- include_tasks: start_osds.yml
   when:
     - inventory_hostname in groups['ceph-osd']
     - remove_ceph_osd_containers.changed
 
-- include: start_rgws.yml
+- include_tasks: start_rgws.yml
   when:
     - inventory_hostname in groups['ceph-rgw']
     - remove_ceph_rgw_container.changed

ansible/roles/ceph/tasks/start_mdss.yml

@@ -1,5 +1,5 @@
 ---
-- include: ../../ceph_pools.yml
+- include_tasks: ../../ceph_pools.yml
   vars:
     pool_name: "{{ item.pool_name }}"
     pool_type: "{{ item.pool_type }}"

ansible/roles/ceph/tasks/upgrade.yml

@@ -1,5 +1,5 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
 # NOTE(jeffrey4l): client.admin caps should be update when upgrade from Jewel
 # to Luminous
@@ -10,26 +10,26 @@
   run_once: True
   delegate_to: "{{ groups['ceph-mon'][0] }}"
 
-- include: start_mons.yml
+- include_tasks: start_mons.yml
   when: inventory_hostname in groups['ceph-mon']
 
-- include: start_mgrs.yml
+- include_tasks: start_mgrs.yml
   when: inventory_hostname in groups['ceph-mgr']
 
-- include: start_osds.yml
+- include_tasks: start_osds.yml
   when: inventory_hostname in groups['ceph-osd']
 
-- include: start_rgws.yml
+- include_tasks: start_rgws.yml
   when:
     - enable_ceph_rgw | bool
     - inventory_hostname in groups['ceph-rgw']
 
-- include: start_mdss.yml
+- include_tasks: start_mdss.yml
   when:
     - enable_ceph_mds | bool
     - inventory_hostname in groups['ceph-mds']
 
-- include: start_nfss.yml
+- include_tasks: start_nfss.yml
   when:
     - enable_ceph_nfs | bool
     - inventory_hostname in groups['ceph-nfs']

ansible/roles/certificates/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: generate.yml
+- include_tasks: generate.yml

ansible/roles/chrony/tasks/deploy.yml

@@ -1,5 +1,5 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/chrony/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/chrony/tasks/reconfigure.yml

@@ -1,2 +1,2 @@
 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/chrony/tasks/upgrade.yml

@@ -1,2 +1,2 @@
 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/cinder/tasks/bootstrap.yml

@@ -32,5 +32,5 @@
   when:
     - not use_preconfigured_databases | bool
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
   when: database.changed or use_preconfigured_databases | bool

ansible/roles/cinder/tasks/ceph.yml

@@ -36,7 +36,7 @@
     - item.key in services_need_config
   with_dict: "{{ cinder_services }}"
 
-- include: ../../ceph_pools.yml
+- include_tasks: ../../ceph_pools.yml
   vars:
     pool_name: "{{ cinder_pool_name }}"
     pool_type: "{{ cinder_pool_type }}"
@@ -45,7 +45,7 @@
     pool_pgp_num: "{{ cinder_pool_pgp_num }}"
     pool_application: "rbd"
 
-- include: ../../ceph_pools.yml
+- include_tasks: ../../ceph_pools.yml
   vars:
     pool_name: "{{ cinder_backup_pool_name }}"
     pool_type: "{{ cinder_backup_pool_type }}"

ansible/roles/cinder/tasks/deploy.yml

@@ -1,5 +1,5 @@
 ---
-- include: ceph.yml
+- include_tasks: ceph.yml
   when:
     - (enable_ceph | bool) and (cinder_backend_ceph | bool)
     - inventory_hostname in groups['ceph-mon'] or
@@ -8,31 +8,31 @@
         inventory_hostname in groups['cinder-scheduler'] or
         inventory_hostname in groups['cinder-backup']
 
-- include: external_ceph.yml
+- include_tasks: external_ceph.yml
   when:
     - (enable_ceph | bool == False) and (cinder_backend_ceph | bool)
     - inventory_hostname in groups['cinder-volume'] or
       inventory_hostname in groups['cinder-backup']
 
-- include: register.yml
+- include_tasks: register.yml
   when: inventory_hostname in groups['cinder-api']
 
-- include: config.yml
+- include_tasks: config.yml
   when: inventory_hostname in groups['cinder-api'] or
         inventory_hostname in groups['cinder-volume'] or
         inventory_hostname in groups['cinder-scheduler'] or
         inventory_hostname in groups['cinder-backup']
 
-- include: clone.yml
+- include_tasks: clone.yml
   when: cinder_dev_mode | bool
 
-- include: bootstrap.yml
+- include_tasks: bootstrap.yml
   when: inventory_hostname in groups['cinder-api']
 
 - name: Flush handlers
   meta: flush_handlers
 
-- include: check.yml
+- include_tasks: check.yml
   when: inventory_hostname in groups['cinder-api'] or
         inventory_hostname in groups['cinder-volume'] or
         inventory_hostname in groups['cinder-scheduler'] or

ansible/roles/cinder/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/cinder/tasks/reconfigure.yml

@@ -1,2 +1,2 @@
 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/cinder/tasks/upgrade.yml

@@ -1,17 +1,17 @@
 ---
 # NOTE (duonghq): I break pull and config into 2 phases to prevent new version
 # of service start if node or process in node crash accidentally.
-- include: pull.yml
+- include_tasks: pull.yml
   when: inventory_hostname == groups["cinder-api"][0]
 
-- include: config.yml
+- include_tasks: config.yml
   when: inventory_hostname == groups["cinder-api"][0]
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
 
-- include: pull.yml
+- include_tasks: pull.yml
 
-- include: config.yml
+- include_tasks: config.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/cloudkitty/tasks/bootstrap.yml

@@ -32,5 +32,5 @@
   when:
     - not use_preconfigured_databases | bool
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
   when: database.changed or use_preconfigured_databases | bool

ansible/roles/cloudkitty/tasks/deploy.yml

@@ -1,15 +1,15 @@
 ---
-- include: register.yml
+- include_tasks: register.yml
   when: inventory_hostname in groups['cloudkitty-api']
 
-- include: config.yml
+- include_tasks: config.yml
   when: inventory_hostname in groups['cloudkitty-api'] or
         inventory_hostname in groups['cloudkitty-processor']
 
-- include: clone.yml
+- include_tasks: clone.yml
   when: cloudkitty_dev_mode | bool
 
-- include: bootstrap.yml
+- include_tasks: bootstrap.yml
   when: inventory_hostname in groups['cloudkitty-api']
 
 - name: Flush handlers

ansible/roles/cloudkitty/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/cloudkitty/tasks/reconfigure.yml

@@ -1,2 +1,2 @@
 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/cloudkitty/tasks/upgrade.yml

@@ -1,7 +1,7 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/collectd/tasks/deploy.yml

@@ -1,5 +1,5 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/collectd/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/collectd/tasks/reconfigure.yml

@@ -1,2 +1,2 @@
 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/collectd/tasks/upgrade.yml

@@ -1,5 +1,5 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/common/tasks/deploy.yml

@@ -1,7 +1,7 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
-- include: bootstrap.yml
+- include_tasks: bootstrap.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/common/tasks/main.yml

@@ -1,5 +1,5 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
   tags: common
   when: not common_run
 

ansible/roles/common/tasks/reconfigure.yml

@@ -1,2 +1,2 @@
 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/common/tasks/upgrade.yml

@@ -1,5 +1,5 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/congress/tasks/bootstrap.yml

@@ -32,5 +32,5 @@
   when:
     - not use_preconfigured_databases | bool
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
   when: database.changed or use_preconfigured_databases | bool

ansible/roles/congress/tasks/deploy.yml

@@ -1,16 +1,16 @@
 ---
-- include: register.yml
+- include_tasks: register.yml
   when: inventory_hostname in groups['congress-api']
 
-- include: config.yml
+- include_tasks: config.yml
   when: inventory_hostname in groups['congress-api'] or
         inventory_hostname in groups['congress-policy-engine'] or
         inventory_hostname in groups['congress-datasource']
 
-- include: clone.yml
+- include_tasks: clone.yml
   when: congress_dev_mode | bool
 
-- include: bootstrap.yml
+- include_tasks: bootstrap.yml
   when: inventory_hostname in groups['congress-api']
 
 - name: Flush handlers

ansible/roles/congress/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/congress/tasks/reconfigure.yml

@@ -1,2 +1,2 @@
 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/congress/tasks/upgrade.yml

@@ -1,7 +1,7 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/designate/tasks/bootstrap.yml

@@ -42,5 +42,5 @@
   when:
     - not use_preconfigured_databases | bool
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
   when: database.changed or use_preconfigured_databases | bool

ansible/roles/designate/tasks/config.yml

@@ -148,7 +148,7 @@
     - Restart designate-backend-bind9 container
     - Restart designate-worker container
 
-- include: backend_external.yml
+- include_tasks: backend_external.yml
   when: designate_backend_external == 'bind9'
 
 - name: Check if policies shall be overwritten

ansible/roles/designate/tasks/deploy.yml

@@ -1,8 +1,8 @@
 ---
-- include: register.yml
+- include_tasks: register.yml
   when: inventory_hostname in groups['designate-api']
 
-- include: config.yml
+- include_tasks: config.yml
   when: inventory_hostname in groups['designate-api'] or
         inventory_hostname in groups['designate-central'] or
         inventory_hostname in groups['designate-producer'] or
@@ -11,14 +11,14 @@
         inventory_hostname in groups['designate-sink'] or
         inventory_hostname in groups['designate-backend-bind9']
 
-- include: clone.yml
+- include_tasks: clone.yml
   when: designate_dev_mode | bool
 
-- include: bootstrap.yml
+- include_tasks: bootstrap.yml
   when: inventory_hostname in groups['designate-central']
 
 - name: Flush handlers
   meta: flush_handlers
 
-- include: update_pools.yml
+- include_tasks: update_pools.yml
   when: inventory_hostname in groups['designate-worker'][0]

ansible/roles/designate/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/designate/tasks/reconfigure.yml

@@ -1,2 +1,2 @@
 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/designate/tasks/upgrade.yml

@@ -1,9 +1,9 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
 
 - name: Flush handlers
   meta: flush_handlers
 
-- include: update_pools.yml
+- include_tasks: update_pools.yml

ansible/roles/destroy/tasks/main.yml

@@ -1,8 +1,8 @@
 ---
-- include: validate_docker_execute.yml
+- include_tasks: validate_docker_execute.yml
 
-- include: cleanup_containers.yml
+- include_tasks: cleanup_containers.yml
 
-- include: cleanup_images.yml
+- include_tasks: cleanup_images.yml
 
-- include: cleanup_host.yml
+- include_tasks: cleanup_host.yml

ansible/roles/elasticsearch/tasks/deploy.yml

@@ -1,5 +1,5 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/elasticsearch/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/elasticsearch/tasks/reconfigure.yml

@@ -1,2 +1,2 @@
 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/elasticsearch/tasks/upgrade.yml

@@ -1,5 +1,5 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/etcd/tasks/deploy.yml

@@ -1,5 +1,5 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/etcd/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/etcd/tasks/reconfigure.yml

@@ -1,2 +1,2 @@
 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/etcd/tasks/upgrade.yml

@@ -1,5 +1,5 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/freezer/tasks/deploy.yml

@@ -1,12 +1,12 @@
 ---
-- include: register.yml
+- include_tasks: register.yml
   when: inventory_hostname in groups['freezer-api']
 
-- include: config.yml
+- include_tasks: config.yml
   when: inventory_hostname in groups['freezer-api'] or
         inventory_hostname in groups['freezer-scheduler']
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
   when: inventory_hostname in groups['freezer-api']
 
 - name: Flush handlers

ansible/roles/freezer/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/freezer/tasks/reconfigure.yml

@@ -1,2 +1,2 @@
 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/freezer/tasks/upgrade.yml

@@ -1,7 +1,7 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/glance/tasks/bootstrap.yml

@@ -32,5 +32,5 @@
   when:
     - not use_preconfigured_databases | bool
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
   when: database.changed or use_preconfigured_databases | bool

ansible/roles/glance/tasks/ceph.yml

@@ -16,7 +16,7 @@
     mode: "0660"
   when: inventory_hostname in groups['glance-api']
 
-- include: ../../ceph_pools.yml
+- include_tasks: ../../ceph_pools.yml
   vars:
     pool_name: "{{ glance_pool_name }}"
     pool_type: "{{ glance_pool_type }}"

ansible/roles/glance/tasks/config.yml

@@ -1,10 +1,10 @@
 ---
-- include: ceph.yml
+- include_tasks: ceph.yml
   when:
     - enable_ceph | bool
     - glance_backend_ceph | bool
 
-- include: external_ceph.yml
+- include_tasks: external_ceph.yml
   when:
     - enable_ceph | bool == False
     - glance_backend_ceph | bool

ansible/roles/glance/tasks/deploy.yml

@@ -1,21 +1,21 @@
 ---
-- include: register.yml
+- include_tasks: register.yml
   when: inventory_hostname in groups['glance-api']
 
-- include: config.yml
+- include_tasks: config.yml
 
-- include: clone.yml
+- include_tasks: clone.yml
   when:
     - glance_dev_mode | bool
     - inventory_hostname in groups['glance-api'] or
       inventory_hostname in groups['glance-registry']
 
-- include: bootstrap.yml
+- include_tasks: bootstrap.yml
   when: inventory_hostname in groups['glance-api']
 
 - name: Flush handlers
   meta: flush_handlers
 
-- include: check.yml
+- include_tasks: check.yml
   when: inventory_hostname in groups['glance-api'] or
         inventory_hostname in groups['glance-registry']

ansible/roles/glance/tasks/legacy_upgrade.yml

@@ -1,7 +1,7 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/glance/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/glance/tasks/reconfigure.yml

@@ -1,2 +1,2 @@
 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/glance/tasks/rolling_upgrade.yml

@@ -3,13 +3,13 @@
     glance_upgrading: True
 
 # Upgrade first node (NEW NODE in the Glance documentation)
-- include: pull.yml
+- include_tasks: pull.yml
   when: inventory_hostname == groups["glance-api"][0]
 
-- include: config.yml
+- include_tasks: config.yml
   when: inventory_hostname == groups["glance-api"][0]
 
-- include: stop_service.yml
+- include_tasks: stop_service.yml
   when: inventory_hostname == groups["glance-api"][0]
 
 - name: Enable log_bin_trust_function_creators function
@@ -74,10 +74,10 @@
     - Restart glance-api container
 
 # Upgrade remaining node
-- include: pull.yml
+- include_tasks: pull.yml
   when: inventory_hostname != groups["glance-api"][0]
 
-- include: config.yml
+- include_tasks: config.yml
   when: inventory_hostname != groups["glance-api"][0]
 
 - name: Flush handlers

ansible/roles/glance/tasks/upgrade.yml

@@ -1,6 +1,6 @@
 ---
-- include: rolling_upgrade.yml
+- include_tasks: rolling_upgrade.yml
   when: glance_enable_rolling_upgrade | bool
 
-- include: legacy_upgrade.yml
+- include_tasks: legacy_upgrade.yml
   when: not glance_enable_rolling_upgrade | bool

ansible/roles/gnocchi/tasks/bootstrap.yml

@@ -32,5 +32,5 @@
   when:
     - not use_preconfigured_databases | bool
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
   when: database.changed or use_preconfigured_databases | bool

ansible/roles/gnocchi/tasks/ceph.yml

@@ -22,7 +22,7 @@
     - "gnocchi-metricd"
     - "gnocchi-statsd"
 
-- include: ../../ceph_pools.yml
+- include_tasks: ../../ceph_pools.yml
   vars:
     pool_name: "{{ gnocchi_pool_name }}"
     pool_type: "{{ gnocchi_pool_type }}"

ansible/roles/gnocchi/tasks/deploy.yml

@@ -1,23 +1,23 @@
 ---
-- include: ceph.yml
+- include_tasks: ceph.yml
   when:
     - enable_ceph | bool
     - gnocchi_backend_storage == 'ceph'
 
-- include: external_ceph.yml
+- include_tasks: external_ceph.yml
   when:
     - enable_ceph | bool == False
     - gnocchi_backend_storage == 'ceph'
 
-- include: register.yml
+- include_tasks: register.yml
   when: inventory_hostname in groups['gnocchi-api']
 
-- include: config.yml
+- include_tasks: config.yml
   when: inventory_hostname in groups['gnocchi-statsd'] or
         inventory_hostname in groups['gnocchi-api'] or
         inventory_hostname in groups['gnocchi-metricd']
 
-- include: bootstrap.yml
+- include_tasks: bootstrap.yml
   when: inventory_hostname in groups['gnocchi-api']
 
 - name: Flush handlers

ansible/roles/gnocchi/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/gnocchi/tasks/reconfigure.yml

@@ -1,2 +1,2 @@
 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/gnocchi/tasks/upgrade.yml

@@ -1,7 +1,7 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
-- include: bootstrap_service.yml
+- include_tasks: bootstrap_service.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/grafana/tasks/deploy.yml

@@ -1,9 +1,9 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
-- include: bootstrap.yml
+- include_tasks: bootstrap.yml
 
 - name: Flush handlers
   meta: flush_handlers
 
-- include: post_config.yml
+- include_tasks: post_config.yml

ansible/roles/grafana/tasks/main.yml

@@ -1,2 +1,2 @@
 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/grafana/tasks/reconfigure.yml

@@ -1,2 +1,2 @@
 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/grafana/tasks/upgrade.yml

@@ -1,5 +1,5 @@
 ---
-- include: config.yml
+- include_tasks: config.yml
 
 - name: Flush handlers
   meta: flush_handlers