Merge "Performance: replace unconditional include_tasks with import_tasks" into stable/stein

ansible/roles/aodh/tasks/bootstrap.yml

@@ -33,4 +33,4 @@
   when:
     - not use_preconfigured_databases | bool
 
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml

ansible/roles/aodh/tasks/deploy.yml

@@ -2,7 +2,7 @@
 - include_tasks: register.yml
   when: inventory_hostname in groups['aodh-api']
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - include_tasks: clone.yml
   when: aodh_dev_mode | bool

ansible/roles/aodh/tasks/reconfigure.yml

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

ansible/roles/aodh/tasks/upgrade.yml

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

ansible/roles/barbican/tasks/bootstrap.yml

@@ -33,4 +33,4 @@
   when:
     - not use_preconfigured_databases | bool
 
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml

ansible/roles/barbican/tasks/deploy.yml

@@ -2,7 +2,7 @@
 - include_tasks: register.yml
   when: inventory_hostname in groups['barbican-api']
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - include_tasks: clone.yml
   when: barbican_dev_mode | bool

ansible/roles/barbican/tasks/reconfigure.yml

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

ansible/roles/barbican/tasks/upgrade.yml

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

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

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

ansible/roles/bifrost/tasks/deploy.yml

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

ansible/roles/bifrost/tasks/reconfigure.yml

@@ -10,7 +10,7 @@
   with_items:
     - { name: bifrost-deploy, group: bifrost-deploy }
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - name: Check the configs
   become: true

ansible/roles/bifrost/tasks/upgrade.yml

@@ -1,5 +1,5 @@
 ---
 # Stop the container prior to redeploying it.
-- include_tasks: stop.yml
+- import_tasks: stop.yml
 
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml

ansible/roles/blazar/tasks/bootstrap.yml

@@ -53,4 +53,4 @@
   run_once: True
   delegate_to: "{{ groups['blazar-api'][0] }}"
 
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml

ansible/roles/blazar/tasks/deploy.yml

@@ -2,7 +2,7 @@
 - include_tasks: register.yml
   when: inventory_hostname in groups['blazar-api']
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - include_tasks: clone.yml
   when: blazar_dev_mode | bool

ansible/roles/blazar/tasks/reconfigure.yml

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

ansible/roles/blazar/tasks/upgrade.yml

@@ -1,7 +1,7 @@
 ---
-- include_tasks: config.yml
+- import_tasks: config.yml
 
-- include_tasks: bootstrap_service.yml
+- import_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_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml

ansible/roles/ceilometer/tasks/deploy.yml

@@ -2,7 +2,7 @@
 - include_tasks: register.yml
   when: inventory_hostname in groups['ceilometer']
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - include_tasks: clone.yml
   when: ceilometer_dev_mode | bool

ansible/roles/ceilometer/tasks/reconfigure.yml

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

ansible/roles/ceilometer/tasks/upgrade.yml

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

ansible/roles/chrony/tasks/deploy.yml

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

ansible/roles/chrony/tasks/reconfigure.yml

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

ansible/roles/chrony/tasks/upgrade.yml

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

ansible/roles/cinder/tasks/bootstrap.yml

@@ -33,4 +33,4 @@
   when:
     - not use_preconfigured_databases | bool
 
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml

ansible/roles/cinder/tasks/deploy.yml

@@ -2,7 +2,7 @@
 - include_tasks: register.yml
   when: inventory_hostname in groups['cinder-api']
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - include_tasks: clone.yml
   when: cinder_dev_mode | bool
@@ -13,4 +13,4 @@
 - name: Flush handlers
   meta: flush_handlers
 
-- include_tasks: check.yml
+- import_tasks: check.yml

ansible/roles/cinder/tasks/reconfigure.yml

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

ansible/roles/cinder/tasks/upgrade.yml

@@ -4,9 +4,9 @@
 - include_tasks: config.yml
   when: inventory_hostname == groups["cinder-api"][0]
 
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/cloudkitty/tasks/bootstrap.yml

@@ -43,4 +43,4 @@
       database_name: "{{ cloudkitty_influxdb_name }}"
   when: cloudkitty_storage_backend == 'influxdb'
 
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml

ansible/roles/cloudkitty/tasks/deploy.yml

@@ -2,7 +2,7 @@
 - include_tasks: register.yml
   when: inventory_hostname in groups['cloudkitty-api']
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - include_tasks: clone.yml
   when: cloudkitty_dev_mode | bool

ansible/roles/cloudkitty/tasks/reconfigure.yml

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

ansible/roles/cloudkitty/tasks/upgrade.yml

@@ -1,5 +1,5 @@
 ---
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 # NOTE(mgoddard): Transition support for upgrades from Rocky or Stein which may
 # be using the SQLAlchemy storage backend.
@@ -14,7 +14,7 @@
       database_name: "{{ cloudkitty_influxdb_name }}"
   when: cloudkitty_storage_backend == 'influxdb'
 
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/collectd/tasks/deploy.yml

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

ansible/roles/collectd/tasks/reconfigure.yml

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

ansible/roles/collectd/tasks/upgrade.yml

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

ansible/roles/common/tasks/deploy.yml

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

ansible/roles/common/tasks/reconfigure.yml

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

ansible/roles/common/tasks/upgrade.yml

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

ansible/roles/cyborg/tasks/bootstrap.yml

@@ -33,4 +33,4 @@
   when:
     - not use_preconfigured_databases | bool
 
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml

ansible/roles/cyborg/tasks/deploy.yml

@@ -2,7 +2,7 @@
 - include_tasks: register.yml
   when: inventory_hostname in groups['cyborg-api']
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - include_tasks: bootstrap.yml
   when: inventory_hostname in groups['cyborg-api']

ansible/roles/cyborg/tasks/reconfigure.yml

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

ansible/roles/cyborg/tasks/upgrade.yml

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

ansible/roles/designate/tasks/bootstrap.yml

@@ -44,4 +44,4 @@
     - not use_preconfigured_databases | bool
   no_log: true
 
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml

ansible/roles/designate/tasks/deploy.yml

@@ -2,7 +2,7 @@
 - include_tasks: register.yml
   when: inventory_hostname in groups['designate-api']
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - include_tasks: clone.yml
   when: designate_dev_mode | bool

ansible/roles/designate/tasks/reconfigure.yml

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

ansible/roles/designate/tasks/upgrade.yml

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

ansible/roles/elasticsearch/tasks/deploy.yml

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

ansible/roles/elasticsearch/tasks/reconfigure.yml

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

ansible/roles/elasticsearch/tasks/upgrade.yml

@@ -42,9 +42,9 @@
     volumes: "{{ service.volumes }}"
   when: inventory_hostname in groups[service.group]
 
-- include_tasks: config-host.yml
+- import_tasks: config-host.yml
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - name: Flush handlers
   meta: flush_handlers

ansible/roles/etcd/tasks/deploy.yml

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

ansible/roles/etcd/tasks/reconfigure.yml

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

ansible/roles/etcd/tasks/upgrade.yml

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

ansible/roles/freezer/tasks/deploy.yml

@@ -2,7 +2,7 @@
 - include_tasks: register.yml
   when: inventory_hostname in groups['freezer-api']
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - include_tasks: bootstrap_service.yml
   when: inventory_hostname in groups['freezer-api']

ansible/roles/freezer/tasks/reconfigure.yml

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

ansible/roles/freezer/tasks/upgrade.yml

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

ansible/roles/glance/tasks/bootstrap.yml

@@ -33,4 +33,4 @@
   when:
     - not use_preconfigured_databases | bool
 
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml

ansible/roles/glance/tasks/deploy.yml

@@ -1,7 +1,7 @@
 ---
 - import_tasks: register.yml
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - include_tasks: clone.yml
   when:
@@ -12,4 +12,4 @@
 - name: Flush handlers
   meta: flush_handlers
 
-- include_tasks: check.yml
+- import_tasks: check.yml

ansible/roles/glance/tasks/legacy_upgrade.yml

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

ansible/roles/glance/tasks/reconfigure.yml

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

ansible/roles/gnocchi/tasks/bootstrap.yml

@@ -33,4 +33,4 @@
   when:
     - not use_preconfigured_databases | bool
 
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml

ansible/roles/gnocchi/tasks/deploy.yml

@@ -2,7 +2,7 @@
 - include_tasks: register.yml
   when: inventory_hostname in groups['gnocchi-api']
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - include_tasks: bootstrap.yml
   when: inventory_hostname in groups['gnocchi-api']

ansible/roles/gnocchi/tasks/reconfigure.yml

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

ansible/roles/gnocchi/tasks/upgrade.yml

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

ansible/roles/grafana/tasks/deploy.yml

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

ansible/roles/grafana/tasks/reconfigure.yml

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

ansible/roles/grafana/tasks/upgrade.yml

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

ansible/roles/haproxy/tasks/deploy.yml

@@ -1,7 +1,7 @@
 ---
-- include_tasks: config-host.yml
+- import_tasks: config-host.yml
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 # NOTE(yoctozepto): haproxy role handlers should not be flushed early.
 # site.yml handles all haproxy things in a dedicated play.

ansible/roles/haproxy/tasks/reconfigure.yml

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

ansible/roles/haproxy/tasks/upgrade.yml

@@ -1,7 +1,7 @@
 ---
-- include_tasks: config-host.yml
+- import_tasks: config-host.yml
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - set_fact: secondary_addresses={{ hostvars[inventory_hostname]['ansible_' + api_interface].get('ipv4_secondaries', []) | map(attribute='address') | list }}
 

ansible/roles/heat/tasks/bootstrap.yml

@@ -33,4 +33,4 @@
   when:
     - not use_preconfigured_databases | bool
 
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml

ansible/roles/heat/tasks/deploy.yml

@@ -2,7 +2,7 @@
 - include_tasks: register.yml
   when: inventory_hostname in groups['heat-api']
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - include_tasks: clone.yml
   when:

ansible/roles/heat/tasks/reconfigure.yml

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

ansible/roles/heat/tasks/upgrade.yml

@@ -1,7 +1,7 @@
 ---
-- include_tasks: config.yml
+- import_tasks: config.yml
 
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
 
 # NOTE(priteau): Remove this task in V cycle.
 - name: Remove heat-engine environment file

ansible/roles/horizon/tasks/bootstrap.yml

@@ -33,4 +33,4 @@
   when:
     - not use_preconfigured_databases | bool
 
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml

ansible/roles/horizon/tasks/deploy.yml

@@ -1,5 +1,5 @@
 ---
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - include_tasks: clone.yml
   when:

ansible/roles/horizon/tasks/reconfigure.yml

@@ -1,2 +1,2 @@
 ---
-- include_tasks: "deploy.yml"
+- import_tasks: deploy.yml

ansible/roles/horizon/tasks/upgrade.yml

@@ -1,5 +1,5 @@
 ---
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - include_tasks: clone.yml
   when:

ansible/roles/influxdb/tasks/deploy.yml

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

ansible/roles/influxdb/tasks/reconfigure.yml

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

ansible/roles/influxdb/tasks/upgrade.yml

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

ansible/roles/ironic/tasks/bootstrap.yml

@@ -51,7 +51,7 @@
     - not use_preconfigured_databases | bool
     - inventory_hostname in groups[item.group]
 
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
 
 - name: Running Ironic-PXE bootstrap container
   vars:

ansible/roles/ironic/tasks/deploy.yml

@@ -4,9 +4,9 @@
         (inventory_hostname in groups['ironic-api'] or
         inventory_hostname in groups['ironic-inspector'])
 
-- include_tasks: config-host.yml
+- import_tasks: config-host.yml
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - include_tasks: clone.yml
   when: ironic_dev_mode | bool

ansible/roles/ironic/tasks/legacy_upgrade.yml

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

ansible/roles/ironic/tasks/reconfigure.yml

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

ansible/roles/ironic/tasks/rolling_upgrade.yml

@@ -1,12 +1,12 @@
 ---
-- include_tasks: config-host.yml
+- import_tasks: config-host.yml
 
 # Pin release version
-- include_tasks: config.yml
+- import_tasks: config.yml
   vars:
     pin_release_version: "{{ openstack_previous_release_name }}"
 
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
 
 # TODO(donghm): Flush_handlers to restart ironic services
 # should be run in serial nodes to decrease downtime. Update when
@@ -17,7 +17,7 @@
   meta: flush_handlers
 
 # Unpin version
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 # Restart ironic services with unpinned release version
 - name: Flush handlers

ansible/roles/iscsi/tasks/deploy.yml

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

ansible/roles/iscsi/tasks/reconfigure.yml

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

ansible/roles/iscsi/tasks/upgrade.yml

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

ansible/roles/kafka/tasks/deploy.yml

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

ansible/roles/kafka/tasks/reconfigure.yml

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

ansible/roles/kafka/tasks/upgrade.yml

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

ansible/roles/karbor/tasks/bootstrap.yml

@@ -33,4 +33,4 @@
   when:
     - not use_preconfigured_databases | bool
 
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml

ansible/roles/karbor/tasks/deploy.yml

@@ -2,7 +2,7 @@
 - include_tasks: register.yml
   when: inventory_hostname in groups['karbor-api']
 
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - include_tasks: bootstrap.yml
   when: inventory_hostname in groups['karbor-api']

ansible/roles/karbor/tasks/reconfigure.yml

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

ansible/roles/karbor/tasks/upgrade.yml

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

ansible/roles/keystone/tasks/bootstrap.yml

@@ -33,4 +33,4 @@
   when:
     - not use_preconfigured_databases | bool
 
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml

ansible/roles/keystone/tasks/deploy.yml

@@ -1,11 +1,11 @@
 ---
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - include_tasks: clone.yml
   when:
     - keystone_dev_mode | bool
 
-- include_tasks: bootstrap.yml
+- import_tasks: bootstrap.yml
 
 - name: Flush handlers
   meta: flush_handlers
@@ -14,6 +14,6 @@
   when:
     - keystone_token_provider == 'fernet'
 
-- include_tasks: register.yml
+- import_tasks: register.yml
 
-- include_tasks: check.yml
+- import_tasks: check.yml

ansible/roles/keystone/tasks/reconfigure.yml

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

ansible/roles/keystone/tasks/upgrade.yml

@@ -1,5 +1,5 @@
 ---
-- include_tasks: config.yml
+- import_tasks: config.yml
 
 - name: Enable log_bin_trust_function_creators function
   become: true

ansible/roles/kibana/tasks/deploy.yml

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

ansible/roles/kibana/tasks/reconfigure.yml

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