From b685ac44e06722680cea840b6922977071f8bf7c Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Mon, 29 Jun 2020 15:06:53 +0100
Subject: [PATCH] Performance: replace unconditional include_tasks with
import_tasks
Including tasks has a performance penalty when compared with importing
tasks. If the include has a condition associated with it, then the
overhead of the include may be lower than the overhead of skipping all
imported tasks. For unconditionally included tasks, switching to
import_tasks provides a clear benefit.
Benchmarking of include vs. import is available at [1].
This change switches from include_tasks to import_tasks where there is
no condition applied to the include.
[1] https://github.com/stackhpc/ansible-scaling/blob/master/doc/include-and-import.md#task-include-and-import
Partially-Implements: blueprint performance-improvements
Change-Id: Ia45af4a198e422773d9f009c7f7b2e32ce9e3b97
---
ansible/roles/aodh/tasks/bootstrap.yml | 2 +-
ansible/roles/aodh/tasks/deploy.yml | 2 +-
ansible/roles/aodh/tasks/reconfigure.yml | 2 +-
ansible/roles/aodh/tasks/upgrade.yml | 4 ++--
ansible/roles/barbican/tasks/bootstrap.yml | 2 +-
ansible/roles/barbican/tasks/deploy.yml | 2 +-
ansible/roles/barbican/tasks/reconfigure.yml | 2 +-
ansible/roles/barbican/tasks/upgrade.yml | 4 ++--
ansible/roles/baremetal/tasks/bootstrap-servers.yml | 6 +++---
ansible/roles/bifrost/tasks/deploy.yml | 6 +++---
ansible/roles/bifrost/tasks/reconfigure.yml | 2 +-
ansible/roles/bifrost/tasks/upgrade.yml | 4 ++--
ansible/roles/blazar/tasks/bootstrap.yml | 2 +-
ansible/roles/blazar/tasks/deploy.yml | 2 +-
ansible/roles/blazar/tasks/reconfigure.yml | 2 +-
ansible/roles/blazar/tasks/upgrade.yml | 4 ++--
ansible/roles/ceilometer/tasks/bootstrap.yml | 2 +-
ansible/roles/ceilometer/tasks/deploy.yml | 2 +-
ansible/roles/ceilometer/tasks/reconfigure.yml | 2 +-
ansible/roles/ceilometer/tasks/upgrade.yml | 4 ++--
ansible/roles/chrony/tasks/deploy.yml | 2 +-
ansible/roles/chrony/tasks/reconfigure.yml | 2 +-
ansible/roles/chrony/tasks/upgrade.yml | 2 +-
ansible/roles/cinder/tasks/bootstrap.yml | 2 +-
ansible/roles/cinder/tasks/deploy.yml | 4 ++--
ansible/roles/cinder/tasks/reconfigure.yml | 2 +-
ansible/roles/cinder/tasks/upgrade.yml | 4 ++--
ansible/roles/cloudkitty/tasks/bootstrap.yml | 2 +-
ansible/roles/cloudkitty/tasks/deploy.yml | 2 +-
ansible/roles/cloudkitty/tasks/reconfigure.yml | 2 +-
ansible/roles/cloudkitty/tasks/upgrade.yml | 4 ++--
ansible/roles/collectd/tasks/deploy.yml | 2 +-
ansible/roles/collectd/tasks/reconfigure.yml | 2 +-
ansible/roles/collectd/tasks/upgrade.yml | 2 +-
ansible/roles/common/tasks/deploy.yml | 4 ++--
ansible/roles/common/tasks/reconfigure.yml | 2 +-
ansible/roles/common/tasks/upgrade.yml | 2 +-
ansible/roles/cyborg/tasks/bootstrap.yml | 2 +-
ansible/roles/cyborg/tasks/deploy.yml | 2 +-
ansible/roles/cyborg/tasks/reconfigure.yml | 2 +-
ansible/roles/cyborg/tasks/upgrade.yml | 4 ++--
ansible/roles/designate/tasks/bootstrap.yml | 2 +-
ansible/roles/designate/tasks/deploy.yml | 2 +-
ansible/roles/designate/tasks/reconfigure.yml | 2 +-
ansible/roles/designate/tasks/upgrade.yml | 6 +++---
ansible/roles/elasticsearch/tasks/deploy.yml | 4 ++--
ansible/roles/elasticsearch/tasks/reconfigure.yml | 2 +-
ansible/roles/elasticsearch/tasks/upgrade.yml | 4 ++--
ansible/roles/etcd/tasks/deploy.yml | 2 +-
ansible/roles/etcd/tasks/reconfigure.yml | 2 +-
ansible/roles/etcd/tasks/upgrade.yml | 2 +-
ansible/roles/freezer/tasks/bootstrap.yml | 2 +-
ansible/roles/freezer/tasks/deploy.yml | 2 +-
ansible/roles/freezer/tasks/reconfigure.yml | 2 +-
ansible/roles/freezer/tasks/upgrade.yml | 4 ++--
ansible/roles/glance/tasks/bootstrap.yml | 2 +-
ansible/roles/glance/tasks/deploy.yml | 4 ++--
ansible/roles/glance/tasks/legacy_upgrade.yml | 4 ++--
ansible/roles/glance/tasks/reconfigure.yml | 2 +-
ansible/roles/gnocchi/tasks/bootstrap.yml | 2 +-
ansible/roles/gnocchi/tasks/deploy.yml | 2 +-
ansible/roles/gnocchi/tasks/reconfigure.yml | 2 +-
ansible/roles/gnocchi/tasks/upgrade.yml | 4 ++--
ansible/roles/grafana/tasks/deploy.yml | 6 +++---
ansible/roles/grafana/tasks/reconfigure.yml | 2 +-
ansible/roles/grafana/tasks/upgrade.yml | 2 +-
ansible/roles/haproxy/tasks/deploy.yml | 4 ++--
ansible/roles/haproxy/tasks/reconfigure.yml | 2 +-
ansible/roles/haproxy/tasks/upgrade.yml | 4 ++--
ansible/roles/heat/tasks/bootstrap.yml | 2 +-
ansible/roles/heat/tasks/deploy.yml | 2 +-
ansible/roles/heat/tasks/reconfigure.yml | 2 +-
ansible/roles/heat/tasks/upgrade.yml | 4 ++--
ansible/roles/horizon/tasks/bootstrap.yml | 2 +-
ansible/roles/horizon/tasks/deploy.yml | 2 +-
ansible/roles/horizon/tasks/reconfigure.yml | 2 +-
ansible/roles/horizon/tasks/upgrade.yml | 2 +-
ansible/roles/influxdb/tasks/deploy.yml | 2 +-
ansible/roles/influxdb/tasks/reconfigure.yml | 2 +-
ansible/roles/influxdb/tasks/upgrade.yml | 2 +-
ansible/roles/ironic/tasks/bootstrap.yml | 2 +-
ansible/roles/ironic/tasks/deploy.yml | 4 ++--
ansible/roles/ironic/tasks/legacy_upgrade.yml | 6 +++---
ansible/roles/ironic/tasks/reconfigure.yml | 2 +-
ansible/roles/ironic/tasks/rolling_upgrade.yml | 8 ++++----
ansible/roles/iscsi/tasks/deploy.yml | 4 ++--
ansible/roles/iscsi/tasks/reconfigure.yml | 2 +-
ansible/roles/iscsi/tasks/upgrade.yml | 2 +-
ansible/roles/kafka/tasks/deploy.yml | 2 +-
ansible/roles/kafka/tasks/reconfigure.yml | 2 +-
ansible/roles/kafka/tasks/upgrade.yml | 2 +-
ansible/roles/karbor/tasks/bootstrap.yml | 2 +-
ansible/roles/karbor/tasks/deploy.yml | 2 +-
ansible/roles/karbor/tasks/reconfigure.yml | 2 +-
ansible/roles/karbor/tasks/upgrade.yml | 4 ++--
ansible/roles/keystone/tasks/bootstrap.yml | 2 +-
ansible/roles/keystone/tasks/deploy.yml | 8 ++++----
ansible/roles/keystone/tasks/reconfigure.yml | 2 +-
ansible/roles/keystone/tasks/upgrade.yml | 2 +-
ansible/roles/kibana/tasks/deploy.yml | 2 +-
ansible/roles/kibana/tasks/reconfigure.yml | 2 +-
ansible/roles/kibana/tasks/upgrade.yml | 4 ++--
ansible/roles/kuryr/tasks/deploy.yml | 4 ++--
ansible/roles/kuryr/tasks/reconfigure.yml | 2 +-
ansible/roles/kuryr/tasks/upgrade.yml | 2 +-
ansible/roles/magnum/tasks/bootstrap.yml | 2 +-
ansible/roles/magnum/tasks/deploy.yml | 2 +-
ansible/roles/magnum/tasks/reconfigure.yml | 2 +-
ansible/roles/magnum/tasks/upgrade.yml | 4 ++--
ansible/roles/manila/tasks/bootstrap.yml | 2 +-
ansible/roles/manila/tasks/deploy.yml | 2 +-
ansible/roles/manila/tasks/reconfigure.yml | 2 +-
ansible/roles/manila/tasks/upgrade.yml | 4 ++--
ansible/roles/mariadb/tasks/bootstrap.yml | 2 +-
ansible/roles/mariadb/tasks/deploy.yml | 8 ++++----
ansible/roles/mariadb/tasks/reconfigure.yml | 2 +-
ansible/roles/mariadb/tasks/upgrade.yml | 2 +-
ansible/roles/masakari/tasks/bootstrap.yml | 2 +-
ansible/roles/masakari/tasks/deploy.yml | 2 +-
ansible/roles/masakari/tasks/reconfigure.yml | 2 +-
ansible/roles/masakari/tasks/upgrade.yml | 4 ++--
ansible/roles/memcached/tasks/deploy.yml | 2 +-
ansible/roles/memcached/tasks/reconfigure.yml | 2 +-
ansible/roles/memcached/tasks/upgrade.yml | 2 +-
ansible/roles/mistral/tasks/bootstrap.yml | 2 +-
ansible/roles/mistral/tasks/deploy.yml | 2 +-
ansible/roles/mistral/tasks/reconfigure.yml | 2 +-
ansible/roles/mistral/tasks/upgrade.yml | 4 ++--
ansible/roles/monasca/tasks/bootstrap.yml | 2 +-
ansible/roles/monasca/tasks/deploy.yml | 6 +++---
ansible/roles/monasca/tasks/reconfigure.yml | 2 +-
ansible/roles/monasca/tasks/upgrade.yml | 4 ++--
ansible/roles/multipathd/tasks/deploy.yml | 4 ++--
ansible/roles/multipathd/tasks/reconfigure.yml | 2 +-
ansible/roles/multipathd/tasks/upgrade.yml | 4 ++--
ansible/roles/murano/tasks/bootstrap.yml | 2 +-
ansible/roles/murano/tasks/deploy.yml | 4 ++--
ansible/roles/murano/tasks/reconfigure.yml | 2 +-
ansible/roles/murano/tasks/upgrade.yml | 6 +++---
ansible/roles/neutron/tasks/bootstrap.yml | 2 +-
ansible/roles/neutron/tasks/deploy.yml | 4 ++--
ansible/roles/neutron/tasks/legacy_upgrade.yml | 6 +++---
ansible/roles/neutron/tasks/reconfigure.yml | 2 +-
ansible/roles/neutron/tasks/rolling_upgrade.yml | 4 ++--
ansible/roles/nova-cell/tasks/deploy.yml | 4 ++--
ansible/roles/nova-cell/tasks/reconfigure.yml | 2 +-
ansible/roles/nova-cell/tasks/rolling_upgrade.yml | 4 ++--
ansible/roles/nova-cell/tasks/upgrade.yml | 2 +-
ansible/roles/nova/tasks/deploy.yml | 2 +-
ansible/roles/nova/tasks/reconfigure.yml | 2 +-
ansible/roles/nova/tasks/rolling_upgrade.yml | 2 +-
ansible/roles/nova/tasks/upgrade.yml | 2 +-
ansible/roles/octavia/tasks/bootstrap.yml | 2 +-
ansible/roles/octavia/tasks/deploy.yml | 2 +-
ansible/roles/octavia/tasks/reconfigure.yml | 2 +-
ansible/roles/octavia/tasks/upgrade.yml | 4 ++--
ansible/roles/openvswitch/tasks/deploy.yml | 6 +++---
ansible/roles/openvswitch/tasks/reconfigure.yml | 2 +-
ansible/roles/openvswitch/tasks/upgrade.yml | 6 +++---
ansible/roles/ovn/tasks/deploy.yml | 4 ++--
ansible/roles/ovn/tasks/reconfigure.yml | 2 +-
ansible/roles/ovn/tasks/upgrade.yml | 4 ++--
ansible/roles/ovs-dpdk/tasks/deploy.yml | 2 +-
ansible/roles/ovs-dpdk/tasks/reconfigure.yml | 2 +-
ansible/roles/ovs-dpdk/tasks/upgrade.yml | 2 +-
ansible/roles/panko/tasks/bootstrap.yml | 2 +-
ansible/roles/panko/tasks/deploy.yml | 6 +++---
ansible/roles/panko/tasks/reconfigure.yml | 2 +-
ansible/roles/panko/tasks/upgrade.yml | 4 ++--
ansible/roles/placement/tasks/bootstrap.yml | 2 +-
ansible/roles/placement/tasks/deploy.yml | 2 +-
ansible/roles/placement/tasks/reconfigure.yml | 2 +-
ansible/roles/placement/tasks/upgrade.yml | 2 +-
ansible/roles/prechecks/tasks/main.yml | 10 +++++-----
ansible/roles/prometheus/tasks/deploy.yml | 4 ++--
ansible/roles/prometheus/tasks/reconfigure.yml | 2 +-
ansible/roles/prometheus/tasks/upgrade.yml | 2 +-
ansible/roles/prune-images/tasks/main.yml | 4 ++--
ansible/roles/qdrouterd/tasks/deploy.yml | 4 ++--
ansible/roles/qdrouterd/tasks/reconfigure.yml | 2 +-
ansible/roles/qdrouterd/tasks/upgrade.yml | 2 +-
ansible/roles/qinling/tasks/bootstrap.yml | 2 +-
ansible/roles/qinling/tasks/deploy.yml | 2 +-
ansible/roles/qinling/tasks/reconfigure.yml | 2 +-
ansible/roles/qinling/tasks/upgrade.yml | 4 ++--
ansible/roles/rabbitmq/tasks/deploy.yml | 4 ++--
ansible/roles/rabbitmq/tasks/reconfigure.yml | 2 +-
ansible/roles/rabbitmq/tasks/upgrade.yml | 2 +-
ansible/roles/rally/tasks/bootstrap.yml | 2 +-
ansible/roles/rally/tasks/deploy.yml | 4 ++--
ansible/roles/rally/tasks/reconfigure.yml | 2 +-
ansible/roles/rally/tasks/upgrade.yml | 4 ++--
ansible/roles/redis/tasks/deploy.yml | 2 +-
ansible/roles/redis/tasks/reconfigure.yml | 2 +-
ansible/roles/redis/tasks/upgrade.yml | 2 +-
ansible/roles/sahara/tasks/bootstrap.yml | 2 +-
ansible/roles/sahara/tasks/deploy.yml | 2 +-
ansible/roles/sahara/tasks/reconfigure.yml | 2 +-
ansible/roles/sahara/tasks/upgrade.yml | 4 ++--
ansible/roles/searchlight/tasks/bootstrap.yml | 2 +-
ansible/roles/searchlight/tasks/deploy.yml | 6 +++---
ansible/roles/searchlight/tasks/reconfigure.yml | 2 +-
ansible/roles/searchlight/tasks/upgrade.yml | 4 ++--
ansible/roles/senlin/tasks/bootstrap.yml | 2 +-
ansible/roles/senlin/tasks/deploy.yml | 2 +-
ansible/roles/senlin/tasks/reconfigure.yml | 2 +-
ansible/roles/senlin/tasks/upgrade.yml | 4 ++--
ansible/roles/skydive/tasks/deploy.yml | 2 +-
ansible/roles/skydive/tasks/reconfigure.yml | 2 +-
ansible/roles/skydive/tasks/upgrade.yml | 2 +-
ansible/roles/solum/tasks/bootstrap.yml | 2 +-
ansible/roles/solum/tasks/deploy.yml | 2 +-
ansible/roles/solum/tasks/reconfigure.yml | 2 +-
ansible/roles/solum/tasks/upgrade.yml | 4 ++--
ansible/roles/storm/tasks/deploy.yml | 2 +-
ansible/roles/storm/tasks/reconfigure.yml | 2 +-
ansible/roles/storm/tasks/upgrade.yml | 2 +-
ansible/roles/swift/tasks/deploy.yml | 8 ++++----
ansible/roles/swift/tasks/legacy_upgrade.yml | 4 ++--
ansible/roles/swift/tasks/reconfigure.yml | 2 +-
ansible/roles/swift/tasks/rolling_upgrade.yml | 2 +-
ansible/roles/tacker/tasks/bootstrap.yml | 2 +-
ansible/roles/tacker/tasks/deploy.yml | 2 +-
ansible/roles/tacker/tasks/reconfigure.yml | 2 +-
ansible/roles/tacker/tasks/upgrade.yml | 4 ++--
ansible/roles/telegraf/tasks/deploy.yml | 2 +-
ansible/roles/telegraf/tasks/reconfigure.yml | 2 +-
ansible/roles/telegraf/tasks/upgrade.yml | 2 +-
ansible/roles/tempest/tasks/deploy.yml | 2 +-
ansible/roles/tempest/tasks/reconfigure.yml | 2 +-
ansible/roles/tempest/tasks/upgrade.yml | 2 +-
ansible/roles/trove/tasks/bootstrap.yml | 2 +-
ansible/roles/trove/tasks/deploy.yml | 2 +-
ansible/roles/trove/tasks/reconfigure.yml | 2 +-
ansible/roles/trove/tasks/upgrade.yml | 4 ++--
ansible/roles/vitrage/tasks/bootstrap.yml | 2 +-
ansible/roles/vitrage/tasks/deploy.yml | 2 +-
ansible/roles/vitrage/tasks/reconfigure.yml | 2 +-
ansible/roles/vitrage/tasks/upgrade.yml | 4 ++--
ansible/roles/vmtp/tasks/deploy.yml | 2 +-
ansible/roles/vmtp/tasks/reconfigure.yml | 2 +-
ansible/roles/vmtp/tasks/upgrade.yml | 2 +-
ansible/roles/watcher/tasks/bootstrap.yml | 2 +-
ansible/roles/watcher/tasks/deploy.yml | 2 +-
ansible/roles/watcher/tasks/reconfigure.yml | 2 +-
ansible/roles/watcher/tasks/upgrade.yml | 4 ++--
ansible/roles/zookeeper/tasks/deploy.yml | 2 +-
ansible/roles/zookeeper/tasks/reconfigure.yml | 2 +-
ansible/roles/zookeeper/tasks/upgrade.yml | 2 +-
ansible/roles/zun/tasks/bootstrap.yml | 2 +-
ansible/roles/zun/tasks/deploy.yml | 2 +-
ansible/roles/zun/tasks/reconfigure.yml | 2 +-
ansible/roles/zun/tasks/upgrade.yml | 4 ++--
253 files changed, 350 insertions(+), 350 deletions(-)
diff --git a/ansible/roles/aodh/tasks/bootstrap.yml b/ansible/roles/aodh/tasks/bootstrap.yml
index a168dfd8a5..97738e4bb4 100644
--- a/ansible/roles/aodh/tasks/bootstrap.yml
+++ b/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
diff --git a/ansible/roles/aodh/tasks/deploy.yml b/ansible/roles/aodh/tasks/deploy.yml
index 050039b2d5..689830931d 100644
--- a/ansible/roles/aodh/tasks/deploy.yml
+++ b/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
diff --git a/ansible/roles/aodh/tasks/reconfigure.yml b/ansible/roles/aodh/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/aodh/tasks/reconfigure.yml
+++ b/ansible/roles/aodh/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/aodh/tasks/upgrade.yml b/ansible/roles/aodh/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/aodh/tasks/upgrade.yml
+++ b/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
diff --git a/ansible/roles/barbican/tasks/bootstrap.yml b/ansible/roles/barbican/tasks/bootstrap.yml
index 2e1604c08c..e94dde3af4 100644
--- a/ansible/roles/barbican/tasks/bootstrap.yml
+++ b/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
diff --git a/ansible/roles/barbican/tasks/deploy.yml b/ansible/roles/barbican/tasks/deploy.yml
index 1d9559b67f..c46a0a088f 100644
--- a/ansible/roles/barbican/tasks/deploy.yml
+++ b/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
diff --git a/ansible/roles/barbican/tasks/reconfigure.yml b/ansible/roles/barbican/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/barbican/tasks/reconfigure.yml
+++ b/ansible/roles/barbican/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/barbican/tasks/upgrade.yml b/ansible/roles/barbican/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/barbican/tasks/upgrade.yml
+++ b/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
diff --git a/ansible/roles/baremetal/tasks/bootstrap-servers.yml b/ansible/roles/baremetal/tasks/bootstrap-servers.yml
index 820bdd3bbb..03b564a86e 100644
--- a/ansible/roles/baremetal/tasks/bootstrap-servers.yml
+++ b/ansible/roles/baremetal/tasks/bootstrap-servers.yml
@@ -1,9 +1,9 @@
---
-- 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
- include_tasks: configure-containerd-for-zun.yml
when: containerd_configure_for_zun|bool and
diff --git a/ansible/roles/bifrost/tasks/deploy.yml b/ansible/roles/bifrost/tasks/deploy.yml
index 93c1efe7c8..922fca8b55 100644
--- a/ansible/roles/bifrost/tasks/deploy.yml
+++ b/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
diff --git a/ansible/roles/bifrost/tasks/reconfigure.yml b/ansible/roles/bifrost/tasks/reconfigure.yml
index ac3e5ca126..c8f91cd87b 100644
--- a/ansible/roles/bifrost/tasks/reconfigure.yml
+++ b/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
diff --git a/ansible/roles/bifrost/tasks/upgrade.yml b/ansible/roles/bifrost/tasks/upgrade.yml
index a65ad9bc09..8888b58aa8 100644
--- a/ansible/roles/bifrost/tasks/upgrade.yml
+++ b/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
diff --git a/ansible/roles/blazar/tasks/bootstrap.yml b/ansible/roles/blazar/tasks/bootstrap.yml
index acb7880b5f..a0a09e580b 100644
--- a/ansible/roles/blazar/tasks/bootstrap.yml
+++ b/ansible/roles/blazar/tasks/bootstrap.yml
@@ -58,4 +58,4 @@
run_once: True
delegate_to: "{{ groups['blazar-api'][0] }}"
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/blazar/tasks/deploy.yml b/ansible/roles/blazar/tasks/deploy.yml
index 06db3922d1..66a0ade997 100644
--- a/ansible/roles/blazar/tasks/deploy.yml
+++ b/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
diff --git a/ansible/roles/blazar/tasks/reconfigure.yml b/ansible/roles/blazar/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/blazar/tasks/reconfigure.yml
+++ b/ansible/roles/blazar/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/blazar/tasks/upgrade.yml b/ansible/roles/blazar/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/blazar/tasks/upgrade.yml
+++ b/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
diff --git a/ansible/roles/ceilometer/tasks/bootstrap.yml b/ansible/roles/ceilometer/tasks/bootstrap.yml
index f718d4e626..581e7ff2a6 100644
--- a/ansible/roles/ceilometer/tasks/bootstrap.yml
+++ b/ansible/roles/ceilometer/tasks/bootstrap.yml
@@ -1,3 +1,3 @@
---
# TODO(Jeffrey4l): fix idempotent
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/ceilometer/tasks/deploy.yml b/ansible/roles/ceilometer/tasks/deploy.yml
index e6eff0475e..8748d357ab 100644
--- a/ansible/roles/ceilometer/tasks/deploy.yml
+++ b/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
diff --git a/ansible/roles/ceilometer/tasks/reconfigure.yml b/ansible/roles/ceilometer/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/ceilometer/tasks/reconfigure.yml
+++ b/ansible/roles/ceilometer/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/ceilometer/tasks/upgrade.yml b/ansible/roles/ceilometer/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/ceilometer/tasks/upgrade.yml
+++ b/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
diff --git a/ansible/roles/chrony/tasks/deploy.yml b/ansible/roles/chrony/tasks/deploy.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/chrony/tasks/deploy.yml
+++ b/ansible/roles/chrony/tasks/deploy.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/chrony/tasks/reconfigure.yml b/ansible/roles/chrony/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/chrony/tasks/reconfigure.yml
+++ b/ansible/roles/chrony/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/chrony/tasks/upgrade.yml b/ansible/roles/chrony/tasks/upgrade.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/chrony/tasks/upgrade.yml
+++ b/ansible/roles/chrony/tasks/upgrade.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/cinder/tasks/bootstrap.yml b/ansible/roles/cinder/tasks/bootstrap.yml
index c18a53c6a9..e36a403536 100644
--- a/ansible/roles/cinder/tasks/bootstrap.yml
+++ b/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
diff --git a/ansible/roles/cinder/tasks/deploy.yml b/ansible/roles/cinder/tasks/deploy.yml
index 9b3f0d2812..ed8e556ea2 100644
--- a/ansible/roles/cinder/tasks/deploy.yml
+++ b/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
diff --git a/ansible/roles/cinder/tasks/reconfigure.yml b/ansible/roles/cinder/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/cinder/tasks/reconfigure.yml
+++ b/ansible/roles/cinder/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/cinder/tasks/upgrade.yml b/ansible/roles/cinder/tasks/upgrade.yml
index e29184b20e..cf9c0c1bfc 100644
--- a/ansible/roles/cinder/tasks/upgrade.yml
+++ b/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
diff --git a/ansible/roles/cloudkitty/tasks/bootstrap.yml b/ansible/roles/cloudkitty/tasks/bootstrap.yml
index 20cd4ca256..29790ab985 100644
--- a/ansible/roles/cloudkitty/tasks/bootstrap.yml
+++ b/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
diff --git a/ansible/roles/cloudkitty/tasks/deploy.yml b/ansible/roles/cloudkitty/tasks/deploy.yml
index 6184a1e91e..64c2a41a04 100644
--- a/ansible/roles/cloudkitty/tasks/deploy.yml
+++ b/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
diff --git a/ansible/roles/cloudkitty/tasks/reconfigure.yml b/ansible/roles/cloudkitty/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/cloudkitty/tasks/reconfigure.yml
+++ b/ansible/roles/cloudkitty/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/cloudkitty/tasks/upgrade.yml b/ansible/roles/cloudkitty/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/cloudkitty/tasks/upgrade.yml
+++ b/ansible/roles/cloudkitty/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
diff --git a/ansible/roles/collectd/tasks/deploy.yml b/ansible/roles/collectd/tasks/deploy.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/collectd/tasks/deploy.yml
+++ b/ansible/roles/collectd/tasks/deploy.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/collectd/tasks/reconfigure.yml b/ansible/roles/collectd/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/collectd/tasks/reconfigure.yml
+++ b/ansible/roles/collectd/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/collectd/tasks/upgrade.yml b/ansible/roles/collectd/tasks/upgrade.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/collectd/tasks/upgrade.yml
+++ b/ansible/roles/collectd/tasks/upgrade.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/common/tasks/deploy.yml b/ansible/roles/common/tasks/deploy.yml
index 6f6feecec0..6e56d09356 100644
--- a/ansible/roles/common/tasks/deploy.yml
+++ b/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
diff --git a/ansible/roles/common/tasks/reconfigure.yml b/ansible/roles/common/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/common/tasks/reconfigure.yml
+++ b/ansible/roles/common/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/common/tasks/upgrade.yml b/ansible/roles/common/tasks/upgrade.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/common/tasks/upgrade.yml
+++ b/ansible/roles/common/tasks/upgrade.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/cyborg/tasks/bootstrap.yml b/ansible/roles/cyborg/tasks/bootstrap.yml
index 5d4c669220..b03cbad442 100644
--- a/ansible/roles/cyborg/tasks/bootstrap.yml
+++ b/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
diff --git a/ansible/roles/cyborg/tasks/deploy.yml b/ansible/roles/cyborg/tasks/deploy.yml
index 836f6a21b0..e4ed69fcca 100644
--- a/ansible/roles/cyborg/tasks/deploy.yml
+++ b/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']
diff --git a/ansible/roles/cyborg/tasks/reconfigure.yml b/ansible/roles/cyborg/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/cyborg/tasks/reconfigure.yml
+++ b/ansible/roles/cyborg/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/cyborg/tasks/upgrade.yml b/ansible/roles/cyborg/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/cyborg/tasks/upgrade.yml
+++ b/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
diff --git a/ansible/roles/designate/tasks/bootstrap.yml b/ansible/roles/designate/tasks/bootstrap.yml
index 0317c1fd3f..a4bc32429e 100644
--- a/ansible/roles/designate/tasks/bootstrap.yml
+++ b/ansible/roles/designate/tasks/bootstrap.yml
@@ -40,4 +40,4 @@
- not use_preconfigured_databases | bool
no_log: true
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/designate/tasks/deploy.yml b/ansible/roles/designate/tasks/deploy.yml
index b1d3258407..26e67caec1 100644
--- a/ansible/roles/designate/tasks/deploy.yml
+++ b/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
diff --git a/ansible/roles/designate/tasks/reconfigure.yml b/ansible/roles/designate/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/designate/tasks/reconfigure.yml
+++ b/ansible/roles/designate/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/designate/tasks/upgrade.yml b/ansible/roles/designate/tasks/upgrade.yml
index df17b506bd..2ccfafe0f6 100644
--- a/ansible/roles/designate/tasks/upgrade.yml
+++ b/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
diff --git a/ansible/roles/elasticsearch/tasks/deploy.yml b/ansible/roles/elasticsearch/tasks/deploy.yml
index 4768324898..982db9c17b 100644
--- a/ansible/roles/elasticsearch/tasks/deploy.yml
+++ b/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
diff --git a/ansible/roles/elasticsearch/tasks/reconfigure.yml b/ansible/roles/elasticsearch/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/elasticsearch/tasks/reconfigure.yml
+++ b/ansible/roles/elasticsearch/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/elasticsearch/tasks/upgrade.yml b/ansible/roles/elasticsearch/tasks/upgrade.yml
index 790e9bd2ff..d8fb94244f 100644
--- a/ansible/roles/elasticsearch/tasks/upgrade.yml
+++ b/ansible/roles/elasticsearch/tasks/upgrade.yml
@@ -50,9 +50,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
diff --git a/ansible/roles/etcd/tasks/deploy.yml b/ansible/roles/etcd/tasks/deploy.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/etcd/tasks/deploy.yml
+++ b/ansible/roles/etcd/tasks/deploy.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/etcd/tasks/reconfigure.yml b/ansible/roles/etcd/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/etcd/tasks/reconfigure.yml
+++ b/ansible/roles/etcd/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/etcd/tasks/upgrade.yml b/ansible/roles/etcd/tasks/upgrade.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/etcd/tasks/upgrade.yml
+++ b/ansible/roles/etcd/tasks/upgrade.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/freezer/tasks/bootstrap.yml b/ansible/roles/freezer/tasks/bootstrap.yml
index 9268eb5fb7..39aec538ab 100644
--- a/ansible/roles/freezer/tasks/bootstrap.yml
+++ b/ansible/roles/freezer/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/freezer/tasks/deploy.yml b/ansible/roles/freezer/tasks/deploy.yml
index 8beccf8526..426ec16d04 100644
--- a/ansible/roles/freezer/tasks/deploy.yml
+++ b/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: clone.yml
when: freezer_dev_mode | bool
diff --git a/ansible/roles/freezer/tasks/reconfigure.yml b/ansible/roles/freezer/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/freezer/tasks/reconfigure.yml
+++ b/ansible/roles/freezer/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/freezer/tasks/upgrade.yml b/ansible/roles/freezer/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/freezer/tasks/upgrade.yml
+++ b/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
diff --git a/ansible/roles/glance/tasks/bootstrap.yml b/ansible/roles/glance/tasks/bootstrap.yml
index e010875020..f80917486d 100644
--- a/ansible/roles/glance/tasks/bootstrap.yml
+++ b/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
diff --git a/ansible/roles/glance/tasks/deploy.yml b/ansible/roles/glance/tasks/deploy.yml
index 3d745d5fb4..9150e39408 100644
--- a/ansible/roles/glance/tasks/deploy.yml
+++ b/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
diff --git a/ansible/roles/glance/tasks/legacy_upgrade.yml b/ansible/roles/glance/tasks/legacy_upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/glance/tasks/legacy_upgrade.yml
+++ b/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
diff --git a/ansible/roles/glance/tasks/reconfigure.yml b/ansible/roles/glance/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/glance/tasks/reconfigure.yml
+++ b/ansible/roles/glance/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/gnocchi/tasks/bootstrap.yml b/ansible/roles/gnocchi/tasks/bootstrap.yml
index b6f6304ca2..f86bdc9583 100644
--- a/ansible/roles/gnocchi/tasks/bootstrap.yml
+++ b/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
diff --git a/ansible/roles/gnocchi/tasks/deploy.yml b/ansible/roles/gnocchi/tasks/deploy.yml
index 7efeef1fcf..04c48909d8 100644
--- a/ansible/roles/gnocchi/tasks/deploy.yml
+++ b/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']
diff --git a/ansible/roles/gnocchi/tasks/reconfigure.yml b/ansible/roles/gnocchi/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/gnocchi/tasks/reconfigure.yml
+++ b/ansible/roles/gnocchi/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/gnocchi/tasks/upgrade.yml b/ansible/roles/gnocchi/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/gnocchi/tasks/upgrade.yml
+++ b/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
diff --git a/ansible/roles/grafana/tasks/deploy.yml b/ansible/roles/grafana/tasks/deploy.yml
index 2c545ecbc9..41c76648d1 100644
--- a/ansible/roles/grafana/tasks/deploy.yml
+++ b/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
diff --git a/ansible/roles/grafana/tasks/reconfigure.yml b/ansible/roles/grafana/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/grafana/tasks/reconfigure.yml
+++ b/ansible/roles/grafana/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/grafana/tasks/upgrade.yml b/ansible/roles/grafana/tasks/upgrade.yml
index 8c8caee607..ae47e4b7a3 100644
--- a/ansible/roles/grafana/tasks/upgrade.yml
+++ b/ansible/roles/grafana/tasks/upgrade.yml
@@ -12,7 +12,7 @@
when: inventory_hostname in groups['grafana']
register: grafana_differs
-- include_tasks: config.yml
+- import_tasks: config.yml
# NOTE(dszumski): We don't want old Grafana instances running after
# a new instance has updated the DB schema. Since the first instance
diff --git a/ansible/roles/haproxy/tasks/deploy.yml b/ansible/roles/haproxy/tasks/deploy.yml
index e2768de7e2..efc8213396 100644
--- a/ansible/roles/haproxy/tasks/deploy.yml
+++ b/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.
diff --git a/ansible/roles/haproxy/tasks/reconfigure.yml b/ansible/roles/haproxy/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/haproxy/tasks/reconfigure.yml
+++ b/ansible/roles/haproxy/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/haproxy/tasks/upgrade.yml b/ansible/roles/haproxy/tasks/upgrade.yml
index 32a5d4d716..17fcbe07c0 100644
--- a/ansible/roles/haproxy/tasks/upgrade.yml
+++ b/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
- name: Stopping all slave keepalived containers
vars:
diff --git a/ansible/roles/heat/tasks/bootstrap.yml b/ansible/roles/heat/tasks/bootstrap.yml
index 554a166041..16e970813b 100644
--- a/ansible/roles/heat/tasks/bootstrap.yml
+++ b/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
diff --git a/ansible/roles/heat/tasks/deploy.yml b/ansible/roles/heat/tasks/deploy.yml
index 2a390f1df1..9d87180899 100644
--- a/ansible/roles/heat/tasks/deploy.yml
+++ b/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:
diff --git a/ansible/roles/heat/tasks/reconfigure.yml b/ansible/roles/heat/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/heat/tasks/reconfigure.yml
+++ b/ansible/roles/heat/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/heat/tasks/upgrade.yml b/ansible/roles/heat/tasks/upgrade.yml
index 9e5ec40ff4..2089d66dda 100644
--- a/ansible/roles/heat/tasks/upgrade.yml
+++ b/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
diff --git a/ansible/roles/horizon/tasks/bootstrap.yml b/ansible/roles/horizon/tasks/bootstrap.yml
index 2d3bf34812..74f67f2a62 100644
--- a/ansible/roles/horizon/tasks/bootstrap.yml
+++ b/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
diff --git a/ansible/roles/horizon/tasks/deploy.yml b/ansible/roles/horizon/tasks/deploy.yml
index 03ce156989..3ae46de09a 100644
--- a/ansible/roles/horizon/tasks/deploy.yml
+++ b/ansible/roles/horizon/tasks/deploy.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: clone.yml
when:
diff --git a/ansible/roles/horizon/tasks/reconfigure.yml b/ansible/roles/horizon/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/horizon/tasks/reconfigure.yml
+++ b/ansible/roles/horizon/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/horizon/tasks/upgrade.yml b/ansible/roles/horizon/tasks/upgrade.yml
index 8aafca5d29..9542c17add 100644
--- a/ansible/roles/horizon/tasks/upgrade.yml
+++ b/ansible/roles/horizon/tasks/upgrade.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: clone.yml
when:
diff --git a/ansible/roles/influxdb/tasks/deploy.yml b/ansible/roles/influxdb/tasks/deploy.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/influxdb/tasks/deploy.yml
+++ b/ansible/roles/influxdb/tasks/deploy.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/influxdb/tasks/reconfigure.yml b/ansible/roles/influxdb/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/influxdb/tasks/reconfigure.yml
+++ b/ansible/roles/influxdb/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/influxdb/tasks/upgrade.yml b/ansible/roles/influxdb/tasks/upgrade.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/influxdb/tasks/upgrade.yml
+++ b/ansible/roles/influxdb/tasks/upgrade.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/ironic/tasks/bootstrap.yml b/ansible/roles/ironic/tasks/bootstrap.yml
index cb4511a106..ff3bf0e17e 100644
--- a/ansible/roles/ironic/tasks/bootstrap.yml
+++ b/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:
diff --git a/ansible/roles/ironic/tasks/deploy.yml b/ansible/roles/ironic/tasks/deploy.yml
index 11b07dce79..2e31fd5934 100644
--- a/ansible/roles/ironic/tasks/deploy.yml
+++ b/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
diff --git a/ansible/roles/ironic/tasks/legacy_upgrade.yml b/ansible/roles/ironic/tasks/legacy_upgrade.yml
index 618000b321..35f7abe84d 100644
--- a/ansible/roles/ironic/tasks/legacy_upgrade.yml
+++ b/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
diff --git a/ansible/roles/ironic/tasks/reconfigure.yml b/ansible/roles/ironic/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/ironic/tasks/reconfigure.yml
+++ b/ansible/roles/ironic/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/ironic/tasks/rolling_upgrade.yml b/ansible/roles/ironic/tasks/rolling_upgrade.yml
index 2095610d1f..08f2f3a53e 100644
--- a/ansible/roles/ironic/tasks/rolling_upgrade.yml
+++ b/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
diff --git a/ansible/roles/iscsi/tasks/deploy.yml b/ansible/roles/iscsi/tasks/deploy.yml
index 4768324898..982db9c17b 100644
--- a/ansible/roles/iscsi/tasks/deploy.yml
+++ b/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
diff --git a/ansible/roles/iscsi/tasks/reconfigure.yml b/ansible/roles/iscsi/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/iscsi/tasks/reconfigure.yml
+++ b/ansible/roles/iscsi/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/iscsi/tasks/upgrade.yml b/ansible/roles/iscsi/tasks/upgrade.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/iscsi/tasks/upgrade.yml
+++ b/ansible/roles/iscsi/tasks/upgrade.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/kafka/tasks/deploy.yml b/ansible/roles/kafka/tasks/deploy.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/kafka/tasks/deploy.yml
+++ b/ansible/roles/kafka/tasks/deploy.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/kafka/tasks/reconfigure.yml b/ansible/roles/kafka/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/kafka/tasks/reconfigure.yml
+++ b/ansible/roles/kafka/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/kafka/tasks/upgrade.yml b/ansible/roles/kafka/tasks/upgrade.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/kafka/tasks/upgrade.yml
+++ b/ansible/roles/kafka/tasks/upgrade.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/karbor/tasks/bootstrap.yml b/ansible/roles/karbor/tasks/bootstrap.yml
index fdfbb80935..06a80baeb6 100644
--- a/ansible/roles/karbor/tasks/bootstrap.yml
+++ b/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
diff --git a/ansible/roles/karbor/tasks/deploy.yml b/ansible/roles/karbor/tasks/deploy.yml
index a140dc850b..e9b54a0be7 100644
--- a/ansible/roles/karbor/tasks/deploy.yml
+++ b/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']
diff --git a/ansible/roles/karbor/tasks/reconfigure.yml b/ansible/roles/karbor/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/karbor/tasks/reconfigure.yml
+++ b/ansible/roles/karbor/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/karbor/tasks/upgrade.yml b/ansible/roles/karbor/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/karbor/tasks/upgrade.yml
+++ b/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
diff --git a/ansible/roles/keystone/tasks/bootstrap.yml b/ansible/roles/keystone/tasks/bootstrap.yml
index 7494119815..413830864b 100644
--- a/ansible/roles/keystone/tasks/bootstrap.yml
+++ b/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
diff --git a/ansible/roles/keystone/tasks/deploy.yml b/ansible/roles/keystone/tasks/deploy.yml
index 7a73af2b53..7b389b4b6a 100644
--- a/ansible/roles/keystone/tasks/deploy.yml
+++ b/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
diff --git a/ansible/roles/keystone/tasks/reconfigure.yml b/ansible/roles/keystone/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/keystone/tasks/reconfigure.yml
+++ b/ansible/roles/keystone/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/keystone/tasks/upgrade.yml b/ansible/roles/keystone/tasks/upgrade.yml
index bdecd9676f..ca1d509e1d 100644
--- a/ansible/roles/keystone/tasks/upgrade.yml
+++ b/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
diff --git a/ansible/roles/kibana/tasks/deploy.yml b/ansible/roles/kibana/tasks/deploy.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/kibana/tasks/deploy.yml
+++ b/ansible/roles/kibana/tasks/deploy.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/kibana/tasks/reconfigure.yml b/ansible/roles/kibana/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/kibana/tasks/reconfigure.yml
+++ b/ansible/roles/kibana/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/kibana/tasks/upgrade.yml b/ansible/roles/kibana/tasks/upgrade.yml
index 4192da0fe5..710d7967ce 100644
--- a/ansible/roles/kibana/tasks/upgrade.yml
+++ b/ansible/roles/kibana/tasks/upgrade.yml
@@ -1,7 +1,7 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
-- include_tasks: migrate-kibana-index.yml
+- import_tasks: migrate-kibana-index.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/kuryr/tasks/deploy.yml b/ansible/roles/kuryr/tasks/deploy.yml
index e2aaa677fd..65f7c8e2a1 100644
--- a/ansible/roles/kuryr/tasks/deploy.yml
+++ b/ansible/roles/kuryr/tasks/deploy.yml
@@ -1,7 +1,7 @@
---
-- include_tasks: register.yml
+- import_tasks: register.yml
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: clone.yml
when:
diff --git a/ansible/roles/kuryr/tasks/reconfigure.yml b/ansible/roles/kuryr/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/kuryr/tasks/reconfigure.yml
+++ b/ansible/roles/kuryr/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/kuryr/tasks/upgrade.yml b/ansible/roles/kuryr/tasks/upgrade.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/kuryr/tasks/upgrade.yml
+++ b/ansible/roles/kuryr/tasks/upgrade.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/magnum/tasks/bootstrap.yml b/ansible/roles/magnum/tasks/bootstrap.yml
index e0bdf3b25a..a60ae37f74 100644
--- a/ansible/roles/magnum/tasks/bootstrap.yml
+++ b/ansible/roles/magnum/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/magnum/tasks/deploy.yml b/ansible/roles/magnum/tasks/deploy.yml
index 1ce45c8f11..75b89162ff 100644
--- a/ansible/roles/magnum/tasks/deploy.yml
+++ b/ansible/roles/magnum/tasks/deploy.yml
@@ -2,7 +2,7 @@
- include_tasks: register.yml
when: inventory_hostname in groups['magnum-api']
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: clone.yml
when: magnum_dev_mode | bool
diff --git a/ansible/roles/magnum/tasks/reconfigure.yml b/ansible/roles/magnum/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/magnum/tasks/reconfigure.yml
+++ b/ansible/roles/magnum/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/magnum/tasks/upgrade.yml b/ansible/roles/magnum/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/magnum/tasks/upgrade.yml
+++ b/ansible/roles/magnum/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
diff --git a/ansible/roles/manila/tasks/bootstrap.yml b/ansible/roles/manila/tasks/bootstrap.yml
index 0869b495ed..76dcffc0a9 100644
--- a/ansible/roles/manila/tasks/bootstrap.yml
+++ b/ansible/roles/manila/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/manila/tasks/deploy.yml b/ansible/roles/manila/tasks/deploy.yml
index 6b21fbd007..90372536af 100644
--- a/ansible/roles/manila/tasks/deploy.yml
+++ b/ansible/roles/manila/tasks/deploy.yml
@@ -5,7 +5,7 @@
- include_tasks: register.yml
when: inventory_hostname in groups['manila-api']
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: bootstrap.yml
when: inventory_hostname in groups['manila-api']
diff --git a/ansible/roles/manila/tasks/reconfigure.yml b/ansible/roles/manila/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/manila/tasks/reconfigure.yml
+++ b/ansible/roles/manila/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/manila/tasks/upgrade.yml b/ansible/roles/manila/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/manila/tasks/upgrade.yml
+++ b/ansible/roles/manila/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
diff --git a/ansible/roles/mariadb/tasks/bootstrap.yml b/ansible/roles/mariadb/tasks/bootstrap.yml
index 279f3a43d6..b005088e2f 100644
--- a/ansible/roles/mariadb/tasks/bootstrap.yml
+++ b/ansible/roles/mariadb/tasks/bootstrap.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: lookup_cluster.yml
+- import_tasks: lookup_cluster.yml
- include_tasks: bootstrap_cluster.yml
when:
diff --git a/ansible/roles/mariadb/tasks/deploy.yml b/ansible/roles/mariadb/tasks/deploy.yml
index aa3784f392..b9acd6337f 100644
--- a/ansible/roles/mariadb/tasks/deploy.yml
+++ b/ansible/roles/mariadb/tasks/deploy.yml
@@ -1,12 +1,12 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
-- include_tasks: bootstrap.yml
+- import_tasks: bootstrap.yml
- name: Flush handlers
meta: flush_handlers
-- include_tasks: register.yml
+- import_tasks: register.yml
# Test haproxy user through VIP
-- include_tasks: check.yml
+- import_tasks: check.yml
diff --git a/ansible/roles/mariadb/tasks/reconfigure.yml b/ansible/roles/mariadb/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/mariadb/tasks/reconfigure.yml
+++ b/ansible/roles/mariadb/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/mariadb/tasks/upgrade.yml b/ansible/roles/mariadb/tasks/upgrade.yml
index 3d7686eabb..967d57bdac 100644
--- a/ansible/roles/mariadb/tasks/upgrade.yml
+++ b/ansible/roles/mariadb/tasks/upgrade.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
- name: Run upgrade in MariaDB container
vars:
diff --git a/ansible/roles/masakari/tasks/bootstrap.yml b/ansible/roles/masakari/tasks/bootstrap.yml
index da4e7eb545..6e15a7f1eb 100644
--- a/ansible/roles/masakari/tasks/bootstrap.yml
+++ b/ansible/roles/masakari/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/masakari/tasks/deploy.yml b/ansible/roles/masakari/tasks/deploy.yml
index 52bec8b647..158af3a513 100644
--- a/ansible/roles/masakari/tasks/deploy.yml
+++ b/ansible/roles/masakari/tasks/deploy.yml
@@ -2,7 +2,7 @@
- include_tasks: register.yml
when: inventory_hostname in groups['masakari-api']
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: clone.yml
when: masakari_dev_mode | bool
diff --git a/ansible/roles/masakari/tasks/reconfigure.yml b/ansible/roles/masakari/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/masakari/tasks/reconfigure.yml
+++ b/ansible/roles/masakari/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/masakari/tasks/upgrade.yml b/ansible/roles/masakari/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/masakari/tasks/upgrade.yml
+++ b/ansible/roles/masakari/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
diff --git a/ansible/roles/memcached/tasks/deploy.yml b/ansible/roles/memcached/tasks/deploy.yml
index 89028c0f27..abd540e4d4 100644
--- a/ansible/roles/memcached/tasks/deploy.yml
+++ b/ansible/roles/memcached/tasks/deploy.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
diff --git a/ansible/roles/memcached/tasks/reconfigure.yml b/ansible/roles/memcached/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/memcached/tasks/reconfigure.yml
+++ b/ansible/roles/memcached/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/memcached/tasks/upgrade.yml b/ansible/roles/memcached/tasks/upgrade.yml
index 89028c0f27..abd540e4d4 100644
--- a/ansible/roles/memcached/tasks/upgrade.yml
+++ b/ansible/roles/memcached/tasks/upgrade.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
diff --git a/ansible/roles/mistral/tasks/bootstrap.yml b/ansible/roles/mistral/tasks/bootstrap.yml
index c401e8475e..3757ff081b 100644
--- a/ansible/roles/mistral/tasks/bootstrap.yml
+++ b/ansible/roles/mistral/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/mistral/tasks/deploy.yml b/ansible/roles/mistral/tasks/deploy.yml
index a921f7409b..58aa4e1c8f 100644
--- a/ansible/roles/mistral/tasks/deploy.yml
+++ b/ansible/roles/mistral/tasks/deploy.yml
@@ -2,7 +2,7 @@
- include_tasks: register.yml
when: inventory_hostname in groups['mistral-api']
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: clone.yml
when: mistral_dev_mode | bool
diff --git a/ansible/roles/mistral/tasks/reconfigure.yml b/ansible/roles/mistral/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/mistral/tasks/reconfigure.yml
+++ b/ansible/roles/mistral/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/mistral/tasks/upgrade.yml b/ansible/roles/mistral/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/mistral/tasks/upgrade.yml
+++ b/ansible/roles/mistral/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
diff --git a/ansible/roles/monasca/tasks/bootstrap.yml b/ansible/roles/monasca/tasks/bootstrap.yml
index ff3ede9769..2d0667b892 100644
--- a/ansible/roles/monasca/tasks/bootstrap.yml
+++ b/ansible/roles/monasca/tasks/bootstrap.yml
@@ -36,7 +36,7 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
# NOTE(dszumski): Monasca is not yet compatible with InfluxDB > 1.1.10, which means
# that the official Ansible modules for managing InfluxDB don't work [1].
diff --git a/ansible/roles/monasca/tasks/deploy.yml b/ansible/roles/monasca/tasks/deploy.yml
index 85f3ee9cdd..78575e5a2c 100644
--- a/ansible/roles/monasca/tasks/deploy.yml
+++ b/ansible/roles/monasca/tasks/deploy.yml
@@ -3,7 +3,7 @@
when: inventory_hostname in groups['monasca-agent'] or
inventory_hostname in groups['monasca-api']
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: bootstrap.yml
when: inventory_hostname in groups['monasca-api'] or
@@ -12,6 +12,6 @@
- name: Flush handlers
meta: flush_handlers
-- include_tasks: check.yml
+- import_tasks: check.yml
-- include_tasks: post_config.yml
+- import_tasks: post_config.yml
diff --git a/ansible/roles/monasca/tasks/reconfigure.yml b/ansible/roles/monasca/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/monasca/tasks/reconfigure.yml
+++ b/ansible/roles/monasca/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/monasca/tasks/upgrade.yml b/ansible/roles/monasca/tasks/upgrade.yml
index 6ae1c6a1e3..91d6c8aa8c 100644
--- a/ansible/roles/monasca/tasks/upgrade.yml
+++ b/ansible/roles/monasca/tasks/upgrade.yml
@@ -12,7 +12,7 @@
when: inventory_hostname in groups['monasca-grafana']
register: monasca_grafana_differs
-- include_tasks: config.yml
+- import_tasks: config.yml
# NOTE(dszumski): We don't want old Grafana instances running after
# a new instance has updated the DB schema. Since the first instance
@@ -33,7 +33,7 @@
- include_tasks: register.yml
when: inventory_hostname in groups['monasca-api']
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/multipathd/tasks/deploy.yml b/ansible/roles/multipathd/tasks/deploy.yml
index 4768324898..982db9c17b 100644
--- a/ansible/roles/multipathd/tasks/deploy.yml
+++ b/ansible/roles/multipathd/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
diff --git a/ansible/roles/multipathd/tasks/reconfigure.yml b/ansible/roles/multipathd/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/multipathd/tasks/reconfigure.yml
+++ b/ansible/roles/multipathd/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/multipathd/tasks/upgrade.yml b/ansible/roles/multipathd/tasks/upgrade.yml
index 4768324898..982db9c17b 100644
--- a/ansible/roles/multipathd/tasks/upgrade.yml
+++ b/ansible/roles/multipathd/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
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/murano/tasks/bootstrap.yml b/ansible/roles/murano/tasks/bootstrap.yml
index 0eb0f16d5d..9698807dce 100644
--- a/ansible/roles/murano/tasks/bootstrap.yml
+++ b/ansible/roles/murano/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/murano/tasks/deploy.yml b/ansible/roles/murano/tasks/deploy.yml
index a4bb14e9d5..dff474d775 100644
--- a/ansible/roles/murano/tasks/deploy.yml
+++ b/ansible/roles/murano/tasks/deploy.yml
@@ -2,7 +2,7 @@
- include_tasks: register.yml
when: inventory_hostname in groups['murano-api']
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: clone.yml
when:
@@ -14,4 +14,4 @@
- name: Flush handlers
meta: flush_handlers
-- include_tasks: import_library_packages.yml
+- import_tasks: import_library_packages.yml
diff --git a/ansible/roles/murano/tasks/reconfigure.yml b/ansible/roles/murano/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/murano/tasks/reconfigure.yml
+++ b/ansible/roles/murano/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/murano/tasks/upgrade.yml b/ansible/roles/murano/tasks/upgrade.yml
index 6d0f92f26b..fa9fd68267 100644
--- a/ansible/roles/murano/tasks/upgrade.yml
+++ b/ansible/roles/murano/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: import_library_packages.yml
+- import_tasks: import_library_packages.yml
diff --git a/ansible/roles/neutron/tasks/bootstrap.yml b/ansible/roles/neutron/tasks/bootstrap.yml
index 9fda22538d..89502be09e 100644
--- a/ansible/roles/neutron/tasks/bootstrap.yml
+++ b/ansible/roles/neutron/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/neutron/tasks/deploy.yml b/ansible/roles/neutron/tasks/deploy.yml
index 86aa7c1cc3..fd69598747 100644
--- a/ansible/roles/neutron/tasks/deploy.yml
+++ b/ansible/roles/neutron/tasks/deploy.yml
@@ -5,9 +5,9 @@
- include_tasks: clone.yml
when: neutron_dev_mode | bool
-- include_tasks: config-host.yml
+- import_tasks: config-host.yml
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: config-neutron-fake.yml
when:
diff --git a/ansible/roles/neutron/tasks/legacy_upgrade.yml b/ansible/roles/neutron/tasks/legacy_upgrade.yml
index 39bd9dd029..7d3ba6cda7 100644
--- a/ansible/roles/neutron/tasks/legacy_upgrade.yml
+++ b/ansible/roles/neutron/tasks/legacy_upgrade.yml
@@ -1,14 +1,14 @@
---
-- include_tasks: config-host.yml
+- import_tasks: config-host.yml
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: config-neutron-fake.yml
when:
- inventory_hostname in groups['compute']
- enable_nova_fake | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
- name: Flush Handlers
meta: flush_handlers
diff --git a/ansible/roles/neutron/tasks/reconfigure.yml b/ansible/roles/neutron/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/neutron/tasks/reconfigure.yml
+++ b/ansible/roles/neutron/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/neutron/tasks/rolling_upgrade.yml b/ansible/roles/neutron/tasks/rolling_upgrade.yml
index c0d1d38b36..27fd413f6f 100644
--- a/ansible/roles/neutron/tasks/rolling_upgrade.yml
+++ b/ansible/roles/neutron/tasks/rolling_upgrade.yml
@@ -1,7 +1,7 @@
---
-- include_tasks: config-host.yml
+- import_tasks: config-host.yml
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: config-neutron-fake.yml
when:
diff --git a/ansible/roles/nova-cell/tasks/deploy.yml b/ansible/roles/nova-cell/tasks/deploy.yml
index cb7f1495d5..20a9d8ade4 100644
--- a/ansible/roles/nova-cell/tasks/deploy.yml
+++ b/ansible/roles/nova-cell/tasks/deploy.yml
@@ -2,9 +2,9 @@
- include_tasks: clone.yml
when: nova_dev_mode | bool
-- include_tasks: config-host.yml
+- import_tasks: config-host.yml
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: config-nova-fake.yml
when:
diff --git a/ansible/roles/nova-cell/tasks/reconfigure.yml b/ansible/roles/nova-cell/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/nova-cell/tasks/reconfigure.yml
+++ b/ansible/roles/nova-cell/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/nova-cell/tasks/rolling_upgrade.yml b/ansible/roles/nova-cell/tasks/rolling_upgrade.yml
index 6384901cb4..c53a845c0e 100644
--- a/ansible/roles/nova-cell/tasks/rolling_upgrade.yml
+++ b/ansible/roles/nova-cell/tasks/rolling_upgrade.yml
@@ -1,9 +1,9 @@
---
# Configure host settings.
-- include_tasks: config-host.yml
+- import_tasks: config-host.yml
# Create new set of configs on nodes
-- include_tasks: config.yml
+- import_tasks: config.yml
# TODO(donghm): Flush_handlers to restart nova services
# should be run in serial nodes to decrease downtime if
diff --git a/ansible/roles/nova-cell/tasks/upgrade.yml b/ansible/roles/nova-cell/tasks/upgrade.yml
index d20ad24796..405ab8968a 100644
--- a/ansible/roles/nova-cell/tasks/upgrade.yml
+++ b/ansible/roles/nova-cell/tasks/upgrade.yml
@@ -13,4 +13,4 @@
- item.value.enabled | bool
- nova_safety_upgrade | bool
-- include_tasks: rolling_upgrade.yml
+- import_tasks: rolling_upgrade.yml
diff --git a/ansible/roles/nova/tasks/deploy.yml b/ansible/roles/nova/tasks/deploy.yml
index 8deaa1c699..96549f42d9 100644
--- a/ansible/roles/nova/tasks/deploy.yml
+++ b/ansible/roles/nova/tasks/deploy.yml
@@ -2,7 +2,7 @@
- include_tasks: register.yml
when: inventory_hostname in groups['nova-api']
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/nova/tasks/reconfigure.yml b/ansible/roles/nova/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/nova/tasks/reconfigure.yml
+++ b/ansible/roles/nova/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/nova/tasks/rolling_upgrade.yml b/ansible/roles/nova/tasks/rolling_upgrade.yml
index b0c289ecdb..a8d45b4f2a 100644
--- a/ansible/roles/nova/tasks/rolling_upgrade.yml
+++ b/ansible/roles/nova/tasks/rolling_upgrade.yml
@@ -1,6 +1,6 @@
---
# Create new set of configs on nodes
-- include_tasks: config.yml
+- import_tasks: config.yml
# TODO(donghm): Flush_handlers to restart nova services
# should be run in serial nodes to decrease downtime if
diff --git a/ansible/roles/nova/tasks/upgrade.yml b/ansible/roles/nova/tasks/upgrade.yml
index dc9a5d06bd..25230266a6 100644
--- a/ansible/roles/nova/tasks/upgrade.yml
+++ b/ansible/roles/nova/tasks/upgrade.yml
@@ -27,4 +27,4 @@
- item.value.enabled | bool
- nova_safety_upgrade | bool
-- include_tasks: rolling_upgrade.yml
+- import_tasks: rolling_upgrade.yml
diff --git a/ansible/roles/octavia/tasks/bootstrap.yml b/ansible/roles/octavia/tasks/bootstrap.yml
index 52fb37a2a2..4b76ea70a9 100644
--- a/ansible/roles/octavia/tasks/bootstrap.yml
+++ b/ansible/roles/octavia/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/octavia/tasks/deploy.yml b/ansible/roles/octavia/tasks/deploy.yml
index 8aeb1796a1..110af15008 100644
--- a/ansible/roles/octavia/tasks/deploy.yml
+++ b/ansible/roles/octavia/tasks/deploy.yml
@@ -2,7 +2,7 @@
- include_tasks: register.yml
when: inventory_hostname in groups['octavia-api']
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: clone.yml
when: octavia_dev_mode | bool
diff --git a/ansible/roles/octavia/tasks/reconfigure.yml b/ansible/roles/octavia/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/octavia/tasks/reconfigure.yml
+++ b/ansible/roles/octavia/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/octavia/tasks/upgrade.yml b/ansible/roles/octavia/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/octavia/tasks/upgrade.yml
+++ b/ansible/roles/octavia/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
diff --git a/ansible/roles/openvswitch/tasks/deploy.yml b/ansible/roles/openvswitch/tasks/deploy.yml
index f135d8a295..2c80a0fad0 100644
--- a/ansible/roles/openvswitch/tasks/deploy.yml
+++ b/ansible/roles/openvswitch/tasks/deploy.yml
@@ -1,9 +1,9 @@
---
-- include_tasks: config-host.yml
+- import_tasks: config-host.yml
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush Handlers
meta: flush_handlers
-- include_tasks: post-config.yml
+- import_tasks: post-config.yml
diff --git a/ansible/roles/openvswitch/tasks/reconfigure.yml b/ansible/roles/openvswitch/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/openvswitch/tasks/reconfigure.yml
+++ b/ansible/roles/openvswitch/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/openvswitch/tasks/upgrade.yml b/ansible/roles/openvswitch/tasks/upgrade.yml
index f135d8a295..2c80a0fad0 100644
--- a/ansible/roles/openvswitch/tasks/upgrade.yml
+++ b/ansible/roles/openvswitch/tasks/upgrade.yml
@@ -1,9 +1,9 @@
---
-- include_tasks: config-host.yml
+- import_tasks: config-host.yml
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush Handlers
meta: flush_handlers
-- include_tasks: post-config.yml
+- import_tasks: post-config.yml
diff --git a/ansible/roles/ovn/tasks/deploy.yml b/ansible/roles/ovn/tasks/deploy.yml
index 6f6feecec0..6e56d09356 100644
--- a/ansible/roles/ovn/tasks/deploy.yml
+++ b/ansible/roles/ovn/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
diff --git a/ansible/roles/ovn/tasks/reconfigure.yml b/ansible/roles/ovn/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/ovn/tasks/reconfigure.yml
+++ b/ansible/roles/ovn/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/ovn/tasks/upgrade.yml b/ansible/roles/ovn/tasks/upgrade.yml
index 6f6feecec0..6e56d09356 100644
--- a/ansible/roles/ovn/tasks/upgrade.yml
+++ b/ansible/roles/ovn/tasks/upgrade.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
diff --git a/ansible/roles/ovs-dpdk/tasks/deploy.yml b/ansible/roles/ovs-dpdk/tasks/deploy.yml
index ad915af159..56ef2c0a1f 100644
--- a/ansible/roles/ovs-dpdk/tasks/deploy.yml
+++ b/ansible/roles/ovs-dpdk/tasks/deploy.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush Handlers
meta: flush_handlers
diff --git a/ansible/roles/ovs-dpdk/tasks/reconfigure.yml b/ansible/roles/ovs-dpdk/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/ovs-dpdk/tasks/reconfigure.yml
+++ b/ansible/roles/ovs-dpdk/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/ovs-dpdk/tasks/upgrade.yml b/ansible/roles/ovs-dpdk/tasks/upgrade.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/ovs-dpdk/tasks/upgrade.yml
+++ b/ansible/roles/ovs-dpdk/tasks/upgrade.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/panko/tasks/bootstrap.yml b/ansible/roles/panko/tasks/bootstrap.yml
index 16591cd9de..ab8a967d5e 100644
--- a/ansible/roles/panko/tasks/bootstrap.yml
+++ b/ansible/roles/panko/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/panko/tasks/deploy.yml b/ansible/roles/panko/tasks/deploy.yml
index 7bc54ebbe5..19c518a48a 100644
--- a/ansible/roles/panko/tasks/deploy.yml
+++ b/ansible/roles/panko/tasks/deploy.yml
@@ -1,9 +1,9 @@
---
-- include_tasks: register.yml
+- import_tasks: register.yml
-- include_tasks: config.yml
+- import_tasks: config.yml
-- include_tasks: bootstrap.yml
+- import_tasks: bootstrap.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/panko/tasks/reconfigure.yml b/ansible/roles/panko/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/panko/tasks/reconfigure.yml
+++ b/ansible/roles/panko/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/panko/tasks/upgrade.yml b/ansible/roles/panko/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/panko/tasks/upgrade.yml
+++ b/ansible/roles/panko/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
diff --git a/ansible/roles/placement/tasks/bootstrap.yml b/ansible/roles/placement/tasks/bootstrap.yml
index f0a4b67e93..92e0f4cb1a 100644
--- a/ansible/roles/placement/tasks/bootstrap.yml
+++ b/ansible/roles/placement/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/placement/tasks/deploy.yml b/ansible/roles/placement/tasks/deploy.yml
index efb54983f5..5b5a90528f 100644
--- a/ansible/roles/placement/tasks/deploy.yml
+++ b/ansible/roles/placement/tasks/deploy.yml
@@ -5,7 +5,7 @@
- include_tasks: clone.yml
when: placement_dev_mode | bool
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: bootstrap.yml
when: inventory_hostname in groups['placement-api']
diff --git a/ansible/roles/placement/tasks/reconfigure.yml b/ansible/roles/placement/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/placement/tasks/reconfigure.yml
+++ b/ansible/roles/placement/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/placement/tasks/upgrade.yml b/ansible/roles/placement/tasks/upgrade.yml
index c5c755453e..3968fe74f9 100644
--- a/ansible/roles/placement/tasks/upgrade.yml
+++ b/ansible/roles/placement/tasks/upgrade.yml
@@ -5,7 +5,7 @@
- include_tasks: clone.yml
when: placement_dev_mode | bool
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: bootstrap.yml
when: inventory_hostname in groups['placement-api']
diff --git a/ansible/roles/prechecks/tasks/main.yml b/ansible/roles/prechecks/tasks/main.yml
index fae4f9f03b..297074fe35 100644
--- a/ansible/roles/prechecks/tasks/main.yml
+++ b/ansible/roles/prechecks/tasks/main.yml
@@ -6,16 +6,16 @@
when:
- not enable_chrony | bool
-- include_tasks: datetime_checks.yml
+- import_tasks: datetime_checks.yml
- include_tasks: port_checks.yml
when:
- inventory_hostname not in groups['deployment']|default([])
-- include_tasks: service_checks.yml
+- import_tasks: service_checks.yml
-- include_tasks: package_checks.yml
+- import_tasks: package_checks.yml
-- include_tasks: user_checks.yml
+- import_tasks: user_checks.yml
-- include_tasks: database_checks.yml
+- import_tasks: database_checks.yml
diff --git a/ansible/roles/prometheus/tasks/deploy.yml b/ansible/roles/prometheus/tasks/deploy.yml
index 6f6feecec0..6e56d09356 100644
--- a/ansible/roles/prometheus/tasks/deploy.yml
+++ b/ansible/roles/prometheus/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
diff --git a/ansible/roles/prometheus/tasks/reconfigure.yml b/ansible/roles/prometheus/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/prometheus/tasks/reconfigure.yml
+++ b/ansible/roles/prometheus/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/prometheus/tasks/upgrade.yml b/ansible/roles/prometheus/tasks/upgrade.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/prometheus/tasks/upgrade.yml
+++ b/ansible/roles/prometheus/tasks/upgrade.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/prune-images/tasks/main.yml b/ansible/roles/prune-images/tasks/main.yml
index e6ba545914..3d08385b93 100644
--- a/ansible/roles/prune-images/tasks/main.yml
+++ b/ansible/roles/prune-images/tasks/main.yml
@@ -1,4 +1,4 @@
---
-- include_tasks: validate_docker_execute.yml
+- import_tasks: validate_docker_execute.yml
-- include_tasks: prune_images.yml
+- import_tasks: prune_images.yml
diff --git a/ansible/roles/qdrouterd/tasks/deploy.yml b/ansible/roles/qdrouterd/tasks/deploy.yml
index 97df1dcc53..5e5cf178aa 100644
--- a/ansible/roles/qdrouterd/tasks/deploy.yml
+++ b/ansible/roles/qdrouterd/tasks/deploy.yml
@@ -1,7 +1,7 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
-- include_tasks: add_sasl_user.yml
+- import_tasks: add_sasl_user.yml
diff --git a/ansible/roles/qdrouterd/tasks/reconfigure.yml b/ansible/roles/qdrouterd/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/qdrouterd/tasks/reconfigure.yml
+++ b/ansible/roles/qdrouterd/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/qdrouterd/tasks/upgrade.yml b/ansible/roles/qdrouterd/tasks/upgrade.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/qdrouterd/tasks/upgrade.yml
+++ b/ansible/roles/qdrouterd/tasks/upgrade.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/qinling/tasks/bootstrap.yml b/ansible/roles/qinling/tasks/bootstrap.yml
index c79eb8c17f..f5b0ed9ad7 100644
--- a/ansible/roles/qinling/tasks/bootstrap.yml
+++ b/ansible/roles/qinling/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/qinling/tasks/deploy.yml b/ansible/roles/qinling/tasks/deploy.yml
index ec7230594d..63525f2088 100644
--- a/ansible/roles/qinling/tasks/deploy.yml
+++ b/ansible/roles/qinling/tasks/deploy.yml
@@ -2,7 +2,7 @@
- include_tasks: register.yml
when: inventory_hostname in groups['qinling-api']
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: clone.yml
when: qinling_dev_mode | bool
diff --git a/ansible/roles/qinling/tasks/reconfigure.yml b/ansible/roles/qinling/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/qinling/tasks/reconfigure.yml
+++ b/ansible/roles/qinling/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/qinling/tasks/upgrade.yml b/ansible/roles/qinling/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/qinling/tasks/upgrade.yml
+++ b/ansible/roles/qinling/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
diff --git a/ansible/roles/rabbitmq/tasks/deploy.yml b/ansible/roles/rabbitmq/tasks/deploy.yml
index 6f6feecec0..6e56d09356 100644
--- a/ansible/roles/rabbitmq/tasks/deploy.yml
+++ b/ansible/roles/rabbitmq/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
diff --git a/ansible/roles/rabbitmq/tasks/reconfigure.yml b/ansible/roles/rabbitmq/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/rabbitmq/tasks/reconfigure.yml
+++ b/ansible/roles/rabbitmq/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/rabbitmq/tasks/upgrade.yml b/ansible/roles/rabbitmq/tasks/upgrade.yml
index 3c176eb532..ba7856ae70 100644
--- a/ansible/roles/rabbitmq/tasks/upgrade.yml
+++ b/ansible/roles/rabbitmq/tasks/upgrade.yml
@@ -16,7 +16,7 @@
when: inventory_hostname in groups[role_rabbitmq_groups]
register: rabbitmq_differs
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Stopping all rabbitmq instances but the first node
become: true
diff --git a/ansible/roles/rally/tasks/bootstrap.yml b/ansible/roles/rally/tasks/bootstrap.yml
index 31a496ba54..ce1936d7f9 100644
--- a/ansible/roles/rally/tasks/bootstrap.yml
+++ b/ansible/roles/rally/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/rally/tasks/deploy.yml b/ansible/roles/rally/tasks/deploy.yml
index 6f6feecec0..6e56d09356 100644
--- a/ansible/roles/rally/tasks/deploy.yml
+++ b/ansible/roles/rally/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
diff --git a/ansible/roles/rally/tasks/reconfigure.yml b/ansible/roles/rally/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/rally/tasks/reconfigure.yml
+++ b/ansible/roles/rally/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/rally/tasks/upgrade.yml b/ansible/roles/rally/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/rally/tasks/upgrade.yml
+++ b/ansible/roles/rally/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
diff --git a/ansible/roles/redis/tasks/deploy.yml b/ansible/roles/redis/tasks/deploy.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/redis/tasks/deploy.yml
+++ b/ansible/roles/redis/tasks/deploy.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/redis/tasks/reconfigure.yml b/ansible/roles/redis/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/redis/tasks/reconfigure.yml
+++ b/ansible/roles/redis/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/redis/tasks/upgrade.yml b/ansible/roles/redis/tasks/upgrade.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/redis/tasks/upgrade.yml
+++ b/ansible/roles/redis/tasks/upgrade.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/sahara/tasks/bootstrap.yml b/ansible/roles/sahara/tasks/bootstrap.yml
index a94c5adf76..f25439f6c1 100644
--- a/ansible/roles/sahara/tasks/bootstrap.yml
+++ b/ansible/roles/sahara/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/sahara/tasks/deploy.yml b/ansible/roles/sahara/tasks/deploy.yml
index 79b0d063af..5d2fdc7bb6 100644
--- a/ansible/roles/sahara/tasks/deploy.yml
+++ b/ansible/roles/sahara/tasks/deploy.yml
@@ -2,7 +2,7 @@
- include_tasks: register.yml
when: inventory_hostname in groups['sahara-api']
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: clone.yml
when: sahara_dev_mode | bool
diff --git a/ansible/roles/sahara/tasks/reconfigure.yml b/ansible/roles/sahara/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/sahara/tasks/reconfigure.yml
+++ b/ansible/roles/sahara/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/sahara/tasks/upgrade.yml b/ansible/roles/sahara/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/sahara/tasks/upgrade.yml
+++ b/ansible/roles/sahara/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
diff --git a/ansible/roles/searchlight/tasks/bootstrap.yml b/ansible/roles/searchlight/tasks/bootstrap.yml
index bd1eaa05df..2115ef6239 100644
--- a/ansible/roles/searchlight/tasks/bootstrap.yml
+++ b/ansible/roles/searchlight/tasks/bootstrap.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/searchlight/tasks/deploy.yml b/ansible/roles/searchlight/tasks/deploy.yml
index 7bc54ebbe5..19c518a48a 100644
--- a/ansible/roles/searchlight/tasks/deploy.yml
+++ b/ansible/roles/searchlight/tasks/deploy.yml
@@ -1,9 +1,9 @@
---
-- include_tasks: register.yml
+- import_tasks: register.yml
-- include_tasks: config.yml
+- import_tasks: config.yml
-- include_tasks: bootstrap.yml
+- import_tasks: bootstrap.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/searchlight/tasks/reconfigure.yml b/ansible/roles/searchlight/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/searchlight/tasks/reconfigure.yml
+++ b/ansible/roles/searchlight/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/searchlight/tasks/upgrade.yml b/ansible/roles/searchlight/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/searchlight/tasks/upgrade.yml
+++ b/ansible/roles/searchlight/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
diff --git a/ansible/roles/senlin/tasks/bootstrap.yml b/ansible/roles/senlin/tasks/bootstrap.yml
index ef3715480b..fed3edbd1d 100644
--- a/ansible/roles/senlin/tasks/bootstrap.yml
+++ b/ansible/roles/senlin/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/senlin/tasks/deploy.yml b/ansible/roles/senlin/tasks/deploy.yml
index 8ad1ea84e9..9b4d96e431 100644
--- a/ansible/roles/senlin/tasks/deploy.yml
+++ b/ansible/roles/senlin/tasks/deploy.yml
@@ -2,7 +2,7 @@
- include_tasks: register.yml
when: inventory_hostname in groups['senlin-api']
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: clone.yml
when: senlin_dev_mode | bool
diff --git a/ansible/roles/senlin/tasks/reconfigure.yml b/ansible/roles/senlin/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/senlin/tasks/reconfigure.yml
+++ b/ansible/roles/senlin/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/senlin/tasks/upgrade.yml b/ansible/roles/senlin/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/senlin/tasks/upgrade.yml
+++ b/ansible/roles/senlin/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
diff --git a/ansible/roles/skydive/tasks/deploy.yml b/ansible/roles/skydive/tasks/deploy.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/skydive/tasks/deploy.yml
+++ b/ansible/roles/skydive/tasks/deploy.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/skydive/tasks/reconfigure.yml b/ansible/roles/skydive/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/skydive/tasks/reconfigure.yml
+++ b/ansible/roles/skydive/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/skydive/tasks/upgrade.yml b/ansible/roles/skydive/tasks/upgrade.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/skydive/tasks/upgrade.yml
+++ b/ansible/roles/skydive/tasks/upgrade.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/solum/tasks/bootstrap.yml b/ansible/roles/solum/tasks/bootstrap.yml
index eeeb7a6a96..e89d04bbf7 100644
--- a/ansible/roles/solum/tasks/bootstrap.yml
+++ b/ansible/roles/solum/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/solum/tasks/deploy.yml b/ansible/roles/solum/tasks/deploy.yml
index 0da134083e..13c6259181 100644
--- a/ansible/roles/solum/tasks/deploy.yml
+++ b/ansible/roles/solum/tasks/deploy.yml
@@ -2,7 +2,7 @@
- include_tasks: register.yml
when: inventory_hostname in groups['solum-api']
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: clone.yml
when: solum_dev_mode | bool
diff --git a/ansible/roles/solum/tasks/reconfigure.yml b/ansible/roles/solum/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/solum/tasks/reconfigure.yml
+++ b/ansible/roles/solum/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/solum/tasks/upgrade.yml b/ansible/roles/solum/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/solum/tasks/upgrade.yml
+++ b/ansible/roles/solum/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
diff --git a/ansible/roles/storm/tasks/deploy.yml b/ansible/roles/storm/tasks/deploy.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/storm/tasks/deploy.yml
+++ b/ansible/roles/storm/tasks/deploy.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/storm/tasks/reconfigure.yml b/ansible/roles/storm/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/storm/tasks/reconfigure.yml
+++ b/ansible/roles/storm/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/storm/tasks/upgrade.yml b/ansible/roles/storm/tasks/upgrade.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/storm/tasks/upgrade.yml
+++ b/ansible/roles/storm/tasks/upgrade.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/swift/tasks/deploy.yml b/ansible/roles/swift/tasks/deploy.yml
index d2e2b5ceae..36b96f55c3 100644
--- a/ansible/roles/swift/tasks/deploy.yml
+++ b/ansible/roles/swift/tasks/deploy.yml
@@ -1,10 +1,10 @@
---
-- include_tasks: register.yml
+- import_tasks: register.yml
-- include_tasks: config.yml
+- import_tasks: config.yml
-- include_tasks: start.yml
+- import_tasks: start.yml
vars:
run_start_swift_proxy_server: "yes"
-- include_tasks: check.yml
+- import_tasks: check.yml
diff --git a/ansible/roles/swift/tasks/legacy_upgrade.yml b/ansible/roles/swift/tasks/legacy_upgrade.yml
index 289eed0d62..c894fabf89 100644
--- a/ansible/roles/swift/tasks/legacy_upgrade.yml
+++ b/ansible/roles/swift/tasks/legacy_upgrade.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
# NOTE(pbourke): because the images that are used to start Swift containers
# were refactored for Mitaka, we need to completely remove the existing
@@ -29,6 +29,6 @@
- "swift_object_expirer"
- "swift_proxy_server"
-- include_tasks: start.yml
+- import_tasks: start.yml
vars:
run_start_swift_proxy_server: "yes"
diff --git a/ansible/roles/swift/tasks/reconfigure.yml b/ansible/roles/swift/tasks/reconfigure.yml
index 9d7cf60a86..1c0ef0014f 100644
--- a/ansible/roles/swift/tasks/reconfigure.yml
+++ b/ansible/roles/swift/tasks/reconfigure.yml
@@ -40,7 +40,7 @@
with_items:
- "{{ swift_containers }}"
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Check the configs
become: true
diff --git a/ansible/roles/swift/tasks/rolling_upgrade.yml b/ansible/roles/swift/tasks/rolling_upgrade.yml
index dbaa395c17..5f62a810c1 100644
--- a/ansible/roles/swift/tasks/rolling_upgrade.yml
+++ b/ansible/roles/swift/tasks/rolling_upgrade.yml
@@ -32,7 +32,7 @@
inventory_hostname in groups['swift-container-server'] or
inventory_hostname in groups['swift-object-server']
-- include_tasks: start.yml
+- import_tasks: start.yml
vars:
run_start_swift_proxy_server: "no"
diff --git a/ansible/roles/tacker/tasks/bootstrap.yml b/ansible/roles/tacker/tasks/bootstrap.yml
index 89e0e49d83..1025cb28a4 100644
--- a/ansible/roles/tacker/tasks/bootstrap.yml
+++ b/ansible/roles/tacker/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/tacker/tasks/deploy.yml b/ansible/roles/tacker/tasks/deploy.yml
index 8e08e29250..3628da25da 100644
--- a/ansible/roles/tacker/tasks/deploy.yml
+++ b/ansible/roles/tacker/tasks/deploy.yml
@@ -2,7 +2,7 @@
- include_tasks: register.yml
when: inventory_hostname in groups['tacker-server']
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: clone.yml
when:
diff --git a/ansible/roles/tacker/tasks/reconfigure.yml b/ansible/roles/tacker/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/tacker/tasks/reconfigure.yml
+++ b/ansible/roles/tacker/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/tacker/tasks/upgrade.yml b/ansible/roles/tacker/tasks/upgrade.yml
index 48f446e953..0b64243aa8 100644
--- a/ansible/roles/tacker/tasks/upgrade.yml
+++ b/ansible/roles/tacker/tasks/upgrade.yml
@@ -30,9 +30,9 @@
when:
- inventory_hostname not in tacker_hosts
-- include_tasks: config.yml
+- import_tasks: config.yml
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/telegraf/tasks/deploy.yml b/ansible/roles/telegraf/tasks/deploy.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/telegraf/tasks/deploy.yml
+++ b/ansible/roles/telegraf/tasks/deploy.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/telegraf/tasks/reconfigure.yml b/ansible/roles/telegraf/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/telegraf/tasks/reconfigure.yml
+++ b/ansible/roles/telegraf/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/telegraf/tasks/upgrade.yml b/ansible/roles/telegraf/tasks/upgrade.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/telegraf/tasks/upgrade.yml
+++ b/ansible/roles/telegraf/tasks/upgrade.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/tempest/tasks/deploy.yml b/ansible/roles/tempest/tasks/deploy.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/tempest/tasks/deploy.yml
+++ b/ansible/roles/tempest/tasks/deploy.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/tempest/tasks/reconfigure.yml b/ansible/roles/tempest/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/tempest/tasks/reconfigure.yml
+++ b/ansible/roles/tempest/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/tempest/tasks/upgrade.yml b/ansible/roles/tempest/tasks/upgrade.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/tempest/tasks/upgrade.yml
+++ b/ansible/roles/tempest/tasks/upgrade.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/trove/tasks/bootstrap.yml b/ansible/roles/trove/tasks/bootstrap.yml
index 0194a28d3a..f1f88fb729 100644
--- a/ansible/roles/trove/tasks/bootstrap.yml
+++ b/ansible/roles/trove/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/trove/tasks/deploy.yml b/ansible/roles/trove/tasks/deploy.yml
index 62d1ebd295..514f837bc2 100644
--- a/ansible/roles/trove/tasks/deploy.yml
+++ b/ansible/roles/trove/tasks/deploy.yml
@@ -2,7 +2,7 @@
- include_tasks: register.yml
when: inventory_hostname in groups['trove-api']
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: clone.yml
when: trove_dev_mode | bool
diff --git a/ansible/roles/trove/tasks/reconfigure.yml b/ansible/roles/trove/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/trove/tasks/reconfigure.yml
+++ b/ansible/roles/trove/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/trove/tasks/upgrade.yml b/ansible/roles/trove/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/trove/tasks/upgrade.yml
+++ b/ansible/roles/trove/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
diff --git a/ansible/roles/vitrage/tasks/bootstrap.yml b/ansible/roles/vitrage/tasks/bootstrap.yml
index 2bc3f7fa97..a9565717cf 100644
--- a/ansible/roles/vitrage/tasks/bootstrap.yml
+++ b/ansible/roles/vitrage/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/vitrage/tasks/deploy.yml b/ansible/roles/vitrage/tasks/deploy.yml
index c9f38f1924..726289ab1e 100644
--- a/ansible/roles/vitrage/tasks/deploy.yml
+++ b/ansible/roles/vitrage/tasks/deploy.yml
@@ -2,7 +2,7 @@
- include_tasks: register.yml
when: inventory_hostname in groups['vitrage-api']
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: clone.yml
when: vitrage_dev_mode | bool
diff --git a/ansible/roles/vitrage/tasks/reconfigure.yml b/ansible/roles/vitrage/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/vitrage/tasks/reconfigure.yml
+++ b/ansible/roles/vitrage/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/vitrage/tasks/upgrade.yml b/ansible/roles/vitrage/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/vitrage/tasks/upgrade.yml
+++ b/ansible/roles/vitrage/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
diff --git a/ansible/roles/vmtp/tasks/deploy.yml b/ansible/roles/vmtp/tasks/deploy.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/vmtp/tasks/deploy.yml
+++ b/ansible/roles/vmtp/tasks/deploy.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/vmtp/tasks/reconfigure.yml b/ansible/roles/vmtp/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/vmtp/tasks/reconfigure.yml
+++ b/ansible/roles/vmtp/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/vmtp/tasks/upgrade.yml b/ansible/roles/vmtp/tasks/upgrade.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/vmtp/tasks/upgrade.yml
+++ b/ansible/roles/vmtp/tasks/upgrade.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/watcher/tasks/bootstrap.yml b/ansible/roles/watcher/tasks/bootstrap.yml
index 30337a0221..20732674be 100644
--- a/ansible/roles/watcher/tasks/bootstrap.yml
+++ b/ansible/roles/watcher/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/watcher/tasks/deploy.yml b/ansible/roles/watcher/tasks/deploy.yml
index df83918fa9..f04b4bcc74 100644
--- a/ansible/roles/watcher/tasks/deploy.yml
+++ b/ansible/roles/watcher/tasks/deploy.yml
@@ -2,7 +2,7 @@
- include_tasks: register.yml
when: inventory_hostname in groups['watcher-api']
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: clone.yml
when: watcher_dev_mode | bool
diff --git a/ansible/roles/watcher/tasks/reconfigure.yml b/ansible/roles/watcher/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/watcher/tasks/reconfigure.yml
+++ b/ansible/roles/watcher/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/watcher/tasks/upgrade.yml b/ansible/roles/watcher/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/watcher/tasks/upgrade.yml
+++ b/ansible/roles/watcher/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
diff --git a/ansible/roles/zookeeper/tasks/deploy.yml b/ansible/roles/zookeeper/tasks/deploy.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/zookeeper/tasks/deploy.yml
+++ b/ansible/roles/zookeeper/tasks/deploy.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/zookeeper/tasks/reconfigure.yml b/ansible/roles/zookeeper/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/zookeeper/tasks/reconfigure.yml
+++ b/ansible/roles/zookeeper/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/zookeeper/tasks/upgrade.yml b/ansible/roles/zookeeper/tasks/upgrade.yml
index 375dcad19b..8f7f4dd832 100644
--- a/ansible/roles/zookeeper/tasks/upgrade.yml
+++ b/ansible/roles/zookeeper/tasks/upgrade.yml
@@ -1,5 +1,5 @@
---
-- include_tasks: config.yml
+- import_tasks: config.yml
- name: Flush handlers
meta: flush_handlers
diff --git a/ansible/roles/zun/tasks/bootstrap.yml b/ansible/roles/zun/tasks/bootstrap.yml
index b0fcf0a99c..94c40d0090 100644
--- a/ansible/roles/zun/tasks/bootstrap.yml
+++ b/ansible/roles/zun/tasks/bootstrap.yml
@@ -33,4 +33,4 @@
when:
- not use_preconfigured_databases | bool
-- include_tasks: bootstrap_service.yml
+- import_tasks: bootstrap_service.yml
diff --git a/ansible/roles/zun/tasks/deploy.yml b/ansible/roles/zun/tasks/deploy.yml
index 0e1a16ae11..574c5c69e1 100644
--- a/ansible/roles/zun/tasks/deploy.yml
+++ b/ansible/roles/zun/tasks/deploy.yml
@@ -2,7 +2,7 @@
- include_tasks: register.yml
when: inventory_hostname in groups['zun-api']
-- include_tasks: config.yml
+- import_tasks: config.yml
- include_tasks: clone.yml
when: zun_dev_mode | bool
diff --git a/ansible/roles/zun/tasks/reconfigure.yml b/ansible/roles/zun/tasks/reconfigure.yml
index f670a5b78d..5b10a7e111 100644
--- a/ansible/roles/zun/tasks/reconfigure.yml
+++ b/ansible/roles/zun/tasks/reconfigure.yml
@@ -1,2 +1,2 @@
---
-- include_tasks: deploy.yml
+- import_tasks: deploy.yml
diff --git a/ansible/roles/zun/tasks/upgrade.yml b/ansible/roles/zun/tasks/upgrade.yml
index 20ccddc8f1..22af6f5634 100644
--- a/ansible/roles/zun/tasks/upgrade.yml
+++ b/ansible/roles/zun/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