Merge "Revert "Performance: Use import_tasks in the main plays"" into stable/victoria

Zuul · openstack-gerrit · commit dd28f0f08879 · 2020-12-16T20:07:25.000Z
diff --git a/ansible/roles/aodh/tasks/main.yml b/ansible/roles/aodh/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/barbican/tasks/main.yml b/ansible/roles/barbican/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/baremetal/tasks/main.yml b/ansible/roles/baremetal/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/bifrost/tasks/main.yml b/ansible/roles/bifrost/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/blazar/tasks/main.yml b/ansible/roles/blazar/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/ceilometer/tasks/main.yml b/ansible/roles/ceilometer/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/chrony/tasks/main.yml b/ansible/roles/chrony/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/cinder/tasks/main.yml b/ansible/roles/cinder/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/cloudkitty/tasks/main.yml b/ansible/roles/cloudkitty/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/collectd/tasks/main.yml b/ansible/roles/collectd/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/common/tasks/main.yml b/ansible/roles/common/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/cyborg/tasks/main.yml b/ansible/roles/cyborg/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/designate/tasks/main.yml b/ansible/roles/designate/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/elasticsearch/tasks/main.yml b/ansible/roles/elasticsearch/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/etcd/tasks/main.yml b/ansible/roles/etcd/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/freezer/tasks/main.yml b/ansible/roles/freezer/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/glance/tasks/main.yml b/ansible/roles/glance/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/gnocchi/tasks/main.yml b/ansible/roles/gnocchi/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/grafana/tasks/main.yml b/ansible/roles/grafana/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/haproxy/tasks/main.yml b/ansible/roles/haproxy/tasks/main.yml
@@ -1,2 +1,3 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
+  when: inventory_hostname in groups['haproxy']
diff --git a/ansible/roles/heat/tasks/main.yml b/ansible/roles/heat/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/horizon/tasks/main.yml b/ansible/roles/horizon/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/influxdb/tasks/main.yml b/ansible/roles/influxdb/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/ironic/tasks/main.yml b/ansible/roles/ironic/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/iscsi/tasks/main.yml b/ansible/roles/iscsi/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/kafka/tasks/main.yml b/ansible/roles/kafka/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/karbor/tasks/main.yml b/ansible/roles/karbor/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/keystone/tasks/main.yml b/ansible/roles/keystone/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/kibana/tasks/main.yml b/ansible/roles/kibana/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/kuryr/tasks/main.yml b/ansible/roles/kuryr/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/magnum/tasks/main.yml b/ansible/roles/magnum/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/manila/tasks/main.yml b/ansible/roles/manila/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/mariadb/tasks/main.yml b/ansible/roles/mariadb/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/masakari/tasks/main.yml b/ansible/roles/masakari/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/memcached/tasks/main.yml b/ansible/roles/memcached/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/mistral/tasks/main.yml b/ansible/roles/mistral/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/monasca/tasks/main.yml b/ansible/roles/monasca/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/multipathd/tasks/main.yml b/ansible/roles/multipathd/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/murano/tasks/main.yml b/ansible/roles/murano/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/neutron/tasks/main.yml b/ansible/roles/neutron/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/nova-cell/tasks/main.yml b/ansible/roles/nova-cell/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/nova/tasks/main.yml b/ansible/roles/nova/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/octavia/tasks/main.yml b/ansible/roles/octavia/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/openvswitch/tasks/main.yml b/ansible/roles/openvswitch/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/ovn/tasks/main.yml b/ansible/roles/ovn/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/ovs-dpdk/tasks/main.yml b/ansible/roles/ovs-dpdk/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/panko/tasks/main.yml b/ansible/roles/panko/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/placement/tasks/main.yml b/ansible/roles/placement/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/prometheus/tasks/main.yml b/ansible/roles/prometheus/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/qdrouterd/tasks/main.yml b/ansible/roles/qdrouterd/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/qinling/tasks/main.yml b/ansible/roles/qinling/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/rabbitmq/tasks/main.yml b/ansible/roles/rabbitmq/tasks/main.yml
@@ -1,2 +1,3 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
+  when: inventory_hostname in groups[role_rabbitmq_groups]
diff --git a/ansible/roles/rally/tasks/main.yml b/ansible/roles/rally/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/redis/tasks/main.yml b/ansible/roles/redis/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/sahara/tasks/main.yml b/ansible/roles/sahara/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/searchlight/tasks/main.yml b/ansible/roles/searchlight/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/senlin/tasks/main.yml b/ansible/roles/senlin/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/skydive/tasks/main.yml b/ansible/roles/skydive/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/solum/tasks/main.yml b/ansible/roles/solum/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/storm/tasks/main.yml b/ansible/roles/storm/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/swift/tasks/main.yml b/ansible/roles/swift/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/tacker/tasks/main.yml b/ansible/roles/tacker/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/telegraf/tasks/main.yml b/ansible/roles/telegraf/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/tempest/tasks/main.yml b/ansible/roles/tempest/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/trove/tasks/main.yml b/ansible/roles/trove/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/vitrage/tasks/main.yml b/ansible/roles/vitrage/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/vmtp/tasks/main.yml b/ansible/roles/vmtp/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/watcher/tasks/main.yml b/ansible/roles/watcher/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/zookeeper/tasks/main.yml b/ansible/roles/zookeeper/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"
diff --git a/ansible/roles/zun/tasks/main.yml b/ansible/roles/zun/tasks/main.yml
@@ -1,2 +1,2 @@
 ---
-- import_tasks: "{{ kolla_action }}.yml"
+- include_tasks: "{{ kolla_action }}.yml"

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-- import_tasks: "{{ kolla_action }}.yml"`
	`2`	`+- include_tasks: "{{ kolla_action }}.yml"`