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

 ---
-- 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

 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/aodh/tasks/reconfigure.yml

 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/aodh/tasks/upgrade.yml

 ---
-- 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

 ---
-- 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

 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/barbican/tasks/reconfigure.yml

 ---
-- include: deploy.yml
+- include_tasks: deploy.yml

ansible/roles/barbican/tasks/upgrade.yml

 ---
-- 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

 ---
-- 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

 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/bifrost/tasks/deploy.yml

 ---
-- 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

 ---
-- 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

 ---
-- 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

 ---
-- 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

 ---
-- include: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

ansible/roles/blazar/tasks/reconfigure.yml

 ---
-- include: deploy.yml
+- include_tasks: deploy.yml