Performance: use import_tasks for check-containers.yml

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. In the case of the check-containers.yml include, the included file only has a single task, so the overhead of skipping this task will not be greater than the overhead of the task import. It therefore makes sense to switch to use import_tasks there. Partially-Implements: blueprint performance-improvements Change-Id: I65d911670649960708b9f6a4c110d1a7df1ad8f7
2020-06-29 14:48:43 +01:00 · 2020-06-29 14:48:43 +01:00 · 9702d4c3c3
parent da1d14b186
commit 9702d4c3c3
66 changed files with 66 additions and 66 deletions
--- a/ansible/roles/aodh/tasks/config.yml
+++ b/ansible/roles/aodh/tasks/config.yml
@ -96,5 +96,5 @@
  notify:
    - "Restart aodh-api container"

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/barbican/tasks/config.yml
+++ b/ansible/roles/barbican/tasks/config.yml
@ -142,5 +142,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/blazar/tasks/config.yml
+++ b/ansible/roles/blazar/tasks/config.yml
@ -82,5 +82,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/ceilometer/tasks/config.yml
+++ b/ansible/roles/ceilometer/tasks/config.yml
@ -391,5 +391,5 @@
  notify:
    - "Restart {{ item.key }} container"

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/chrony/tasks/config.yml
+++ b/ansible/roles/chrony/tasks/config.yml
@ -52,5 +52,5 @@
  notify:
    - Restart chrony container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/cinder/tasks/config.yml
+++ b/ansible/roles/cinder/tasks/config.yml
@ -127,5 +127,5 @@
  notify:
    - Restart cinder-volume container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/cloudkitty/tasks/config.yml
+++ b/ansible/roles/cloudkitty/tasks/config.yml
@ -120,5 +120,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/collectd/tasks/config.yml
+++ b/ansible/roles/collectd/tasks/config.yml
@ -57,5 +57,5 @@
  notify:
    - Restart collectd container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/common/tasks/config.yml
+++ b/ansible/roles/common/tasks/config.yml
@ -397,5 +397,5 @@
    - common_services['kolla-toolbox'] | service_enabled_and_mapped_to_host
    - api_address_family == "ipv6"

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/cyborg/tasks/config.yml
+++ b/ansible/roles/cyborg/tasks/config.yml
@ -97,5 +97,5 @@
  notify:
    - Restart cyborg-api container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/designate/tasks/config.yml
+++ b/ansible/roles/designate/tasks/config.yml
@ -152,5 +152,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/elasticsearch/tasks/config.yml
+++ b/ansible/roles/elasticsearch/tasks/config.yml
@ -77,5 +77,5 @@
  notify:
    - Restart elasticsearch-curator container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/etcd/tasks/config.yml
+++ b/ansible/roles/etcd/tasks/config.yml
@ -29,5 +29,5 @@
  when:
    - etcd_enable_tls | bool

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/freezer/tasks/config.yml
+++ b/ansible/roles/freezer/tasks/config.yml
@ -96,5 +96,5 @@
  notify:
    - "Restart {{ item.key }} container"

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/glance/tasks/config.yml
+++ b/ansible/roles/glance/tasks/config.yml
@ -156,5 +156,5 @@
  notify:
    - Restart glance-tls-proxy container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/gnocchi/tasks/config.yml
+++ b/ansible/roles/gnocchi/tasks/config.yml
@ -102,5 +102,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/grafana/tasks/config.yml
+++ b/ansible/roles/grafana/tasks/config.yml
@ -103,5 +103,5 @@
  notify:
    - Restart grafana container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/haproxy/tasks/config.yml
+++ b/ansible/roles/haproxy/tasks/config.yml
@ -147,5 +147,5 @@
  notify:
    - Restart haproxy container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/heat/tasks/config.yml
+++ b/ansible/roles/heat/tasks/config.yml
@ -110,5 +110,5 @@
  notify:
    - Restart heat-api-cfn container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/horizon/tasks/config.yml
+++ b/ansible/roles/horizon/tasks/config.yml
@ -136,5 +136,5 @@
  when:
    - kolla_copy_ca_into_containers | bool or horizon_enable_tls_backend | bool

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/influxdb/tasks/config.yml
+++ b/ansible/roles/influxdb/tasks/config.yml
@ -43,5 +43,5 @@
  notify:
    - Restart influxdb container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/ironic/tasks/config.yml
+++ b/ansible/roles/ironic/tasks/config.yml
@ -244,5 +244,5 @@
  notify:
    - "Restart {{ item.key }} container"

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/iscsi/tasks/config.yml
+++ b/ansible/roles/iscsi/tasks/config.yml
@ -25,5 +25,5 @@
  notify:
    - "Restart {{ item.key }} container"

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/kafka/tasks/config.yml
+++ b/ansible/roles/kafka/tasks/config.yml
@ -41,5 +41,5 @@
  notify:
    - Restart kafka container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/karbor/tasks/config.yml
+++ b/ansible/roles/karbor/tasks/config.yml
@ -83,5 +83,5 @@
  notify:
    - Restart karbor-protection container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/keystone/tasks/config.yml
+++ b/ansible/roles/keystone/tasks/config.yml
@ -230,5 +230,5 @@
  notify:
    - Restart keystone-ssh container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/kibana/tasks/config.yml
+++ b/ansible/roles/kibana/tasks/config.yml
@ -47,5 +47,5 @@
  notify:
    - Restart kibana container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/kuryr/tasks/config.yml
+++ b/ansible/roles/kuryr/tasks/config.yml
@ -98,5 +98,5 @@
  notify:
    - Restart kuryr container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/magnum/tasks/config.yml
+++ b/ansible/roles/magnum/tasks/config.yml
@ -82,5 +82,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/manila/tasks/config.yml
+++ b/ansible/roles/manila/tasks/config.yml
@ -111,5 +111,5 @@
  notify:
    - "Restart {{ item.key }} container"

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/mariadb/tasks/config.yml
+++ b/ansible/roles/mariadb/tasks/config.yml
@ -110,5 +110,5 @@
  notify:
    - restart mariadb-clustercheck

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/memcached/tasks/config.yml
+++ b/ansible/roles/memcached/tasks/config.yml
@ -25,5 +25,5 @@
    - service.enabled | bool
  notify: Restart memcached container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/mistral/tasks/config.yml
+++ b/ansible/roles/mistral/tasks/config.yml
@ -100,5 +100,5 @@
  notify:
    - "Restart mistral-event-engine container"

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/monasca/tasks/config.yml
+++ b/ansible/roles/monasca/tasks/config.yml
@ -385,5 +385,5 @@
  notify:
    - Restart monasca-grafana container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/multipathd/tasks/config.yml
+++ b/ansible/roles/multipathd/tasks/config.yml
@ -38,5 +38,5 @@
  notify:
    - Restart multipathd container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/murano/tasks/config.yml
+++ b/ansible/roles/murano/tasks/config.yml
@ -81,5 +81,5 @@
  notify:
    - "Restart {{ item.key }} container"

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/neutron/tasks/config.yml
+++ b/ansible/roles/neutron/tasks/config.yml
@ -399,5 +399,5 @@
  notify:
    - "Restart {{ item.0 }} container"

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/nova-cell/tasks/config.yml
+++ b/ansible/roles/nova-cell/tasks/config.yml
@ -193,5 +193,5 @@
  notify:
    - "Restart {{ item.key }} container"

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/nova/tasks/config.yml
+++ b/ansible/roles/nova/tasks/config.yml
@ -83,5 +83,5 @@
  notify:
    - "Restart {{ item.key }} container"

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/octavia/tasks/config.yml
+++ b/ansible/roles/octavia/tasks/config.yml
@ -139,5 +139,5 @@
  notify:
    - Restart octavia-health-manager container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/openvswitch/tasks/config.yml
+++ b/ansible/roles/openvswitch/tasks/config.yml
@ -53,5 +53,5 @@
  notify:
    - "Restart openvswitch-db-server container"

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/ovn/tasks/config.yml
+++ b/ansible/roles/ovn/tasks/config.yml
@ -25,5 +25,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/ovs-dpdk/tasks/config.yml
+++ b/ansible/roles/ovs-dpdk/tasks/config.yml
@ -55,5 +55,5 @@
    hugepage_mountpoint: "{{ ovs_hugepage_mountpoint }}"
    ovs_physical_port_policy: "{{ ovs_physical_port_policy }}"

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/panko/tasks/config.yml
+++ b/ansible/roles/panko/tasks/config.yml
@ -96,5 +96,5 @@
  notify:
    - Restart panko-api container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/placement/tasks/config.yml
+++ b/ansible/roles/placement/tasks/config.yml
@ -110,5 +110,5 @@
  notify:
    - "Restart {{ item.key }} container"

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/prometheus/tasks/config.yml
+++ b/ansible/roles/prometheus/tasks/config.yml
@ -213,5 +213,5 @@
    - inventory_hostname in groups[service.group]
    - service.enabled | bool

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/qdrouterd/tasks/config.yml
+++ b/ansible/roles/qdrouterd/tasks/config.yml
@ -61,5 +61,5 @@
  notify:
    - Restart qdrouterd container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/qinling/tasks/config.yml
+++ b/ansible/roles/qinling/tasks/config.yml
@ -101,5 +101,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/rabbitmq/tasks/config.yml
+++ b/ansible/roles/rabbitmq/tasks/config.yml
@ -103,5 +103,5 @@
    - Restart rabbitmq container (first node)
    - Restart rabbitmq container (rest of nodes)

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/rally/tasks/config.yml
+++ b/ansible/roles/rally/tasks/config.yml
@ -79,5 +79,5 @@
  notify:
    - Restart rally container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/redis/tasks/config.yml
+++ b/ansible/roles/redis/tasks/config.yml
@ -38,5 +38,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/sahara/tasks/config.yml
+++ b/ansible/roles/sahara/tasks/config.yml
@ -82,5 +82,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/searchlight/tasks/config.yml
+++ b/ansible/roles/searchlight/tasks/config.yml
@ -81,5 +81,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/senlin/tasks/config.yml
+++ b/ansible/roles/senlin/tasks/config.yml
@ -82,5 +82,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/skydive/tasks/config.yml
+++ b/ansible/roles/skydive/tasks/config.yml
@ -46,5 +46,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/solum/tasks/config.yml
+++ b/ansible/roles/solum/tasks/config.yml
@ -49,5 +49,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/storm/tasks/config.yml
+++ b/ansible/roles/storm/tasks/config.yml
@ -61,5 +61,5 @@
  notify:
    - Restart storm-nimbus container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/tacker/tasks/config.yml
+++ b/ansible/roles/tacker/tasks/config.yml
@ -82,5 +82,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/telegraf/tasks/config.yml
+++ b/ansible/roles/telegraf/tasks/config.yml
@ -63,5 +63,5 @@
  notify:
    - Restart telegraf container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/tempest/tasks/config.yml
+++ b/ansible/roles/tempest/tasks/config.yml
@ -46,5 +46,5 @@
  notify:
    - Restart tempest container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/trove/tasks/config.yml
+++ b/ansible/roles/trove/tasks/config.yml
@ -103,5 +103,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/vitrage/tasks/config.yml
+++ b/ansible/roles/vitrage/tasks/config.yml
@ -109,5 +109,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/vmtp/tasks/config.yml
+++ b/ansible/roles/vmtp/tasks/config.yml
@ -31,5 +31,5 @@
  notify:
    - Restart vmtp container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/watcher/tasks/config.yml
+++ b/ansible/roles/watcher/tasks/config.yml
@ -79,5 +79,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/zookeeper/tasks/config.yml
+++ b/ansible/roles/zookeeper/tasks/config.yml
@ -54,5 +54,5 @@
  notify:
    - Restart zookeeper container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"
--- a/ansible/roles/zun/tasks/config.yml
+++ b/ansible/roles/zun/tasks/config.yml
@ -95,5 +95,5 @@
  notify:
    - Restart {{ item.key }} container

- include_tasks: check-containers.yml
+- import_tasks: check-containers.yml
  when: kolla_action != "config"