commit 3411b9e4201e619613cef427d228cf00f310a144 Author: Radosław Piliszek Date: Thu Jul 30 14:36:15 2020 +0200 Performance: optimize genconfig Config plays do not need to check containers. This avoids skipping tasks during the genconfig action. Ironic and Glance rolling upgrades are handled specially. Swift and Bifrost do not use the handlers at all. Partially-Implements: blueprint performance-improvements Change-Id: I140bf71d62e8f0932c96270d1f08940a5ba4542a diff --git a/ansible/roles/aodh/tasks/config.yml b/ansible/roles/aodh/tasks/config.yml index 3162e6a..0f5d0c1 100644 --- a/ansible/roles/aodh/tasks/config.yml +++ b/ansible/roles/aodh/tasks/config.yml @@ -95,6 +95,3 @@ - service.enabled | bool notify: - "Restart aodh-api container" - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/aodh/tasks/deploy.yml b/ansible/roles/aodh/tasks/deploy.yml index df86282..92e7fce 100644 --- a/ansible/roles/aodh/tasks/deploy.yml +++ b/ansible/roles/aodh/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: aodh_dev_mode | bool diff --git a/ansible/roles/aodh/tasks/upgrade.yml b/ansible/roles/aodh/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/aodh/tasks/upgrade.yml +++ b/ansible/roles/aodh/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/barbican/tasks/config.yml b/ansible/roles/barbican/tasks/config.yml index f29a1ad..4d48f4b 100644 --- a/ansible/roles/barbican/tasks/config.yml +++ b/ansible/roles/barbican/tasks/config.yml @@ -141,6 +141,3 @@ with_dict: "{{ barbican_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/barbican/tasks/deploy.yml b/ansible/roles/barbican/tasks/deploy.yml index c16604a..ae69a9e 100644 --- a/ansible/roles/barbican/tasks/deploy.yml +++ b/ansible/roles/barbican/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: barbican_dev_mode | bool diff --git a/ansible/roles/barbican/tasks/upgrade.yml b/ansible/roles/barbican/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/barbican/tasks/upgrade.yml +++ b/ansible/roles/barbican/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/blazar/tasks/config.yml b/ansible/roles/blazar/tasks/config.yml index 5355874..24c9e0c 100644 --- a/ansible/roles/blazar/tasks/config.yml +++ b/ansible/roles/blazar/tasks/config.yml @@ -81,6 +81,3 @@ with_dict: "{{ blazar_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/blazar/tasks/deploy.yml b/ansible/roles/blazar/tasks/deploy.yml index a2b0cf2..27c21e9 100644 --- a/ansible/roles/blazar/tasks/deploy.yml +++ b/ansible/roles/blazar/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: blazar_dev_mode | bool diff --git a/ansible/roles/blazar/tasks/upgrade.yml b/ansible/roles/blazar/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/blazar/tasks/upgrade.yml +++ b/ansible/roles/blazar/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/ceilometer/tasks/config.yml b/ansible/roles/ceilometer/tasks/config.yml index 128a0c6..55623f0 100644 --- a/ansible/roles/ceilometer/tasks/config.yml +++ b/ansible/roles/ceilometer/tasks/config.yml @@ -390,6 +390,3 @@ with_dict: "{{ ceilometer_services }}" notify: - "Restart {{ item.key }} container" - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/ceilometer/tasks/deploy.yml b/ansible/roles/ceilometer/tasks/deploy.yml index e743691..59e6911 100644 --- a/ansible/roles/ceilometer/tasks/deploy.yml +++ b/ansible/roles/ceilometer/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: ceilometer_dev_mode | bool diff --git a/ansible/roles/ceilometer/tasks/upgrade.yml b/ansible/roles/ceilometer/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/ceilometer/tasks/upgrade.yml +++ b/ansible/roles/ceilometer/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/chrony/tasks/config.yml b/ansible/roles/chrony/tasks/config.yml index b28c4cf..73d80b0 100644 --- a/ansible/roles/chrony/tasks/config.yml +++ b/ansible/roles/chrony/tasks/config.yml @@ -51,6 +51,3 @@ - "chrony.conf.j2" notify: - Restart chrony container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/chrony/tasks/deploy.yml b/ansible/roles/chrony/tasks/deploy.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/chrony/tasks/deploy.yml +++ b/ansible/roles/chrony/tasks/deploy.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/cinder/tasks/config.yml b/ansible/roles/cinder/tasks/config.yml index 9cf7215..c389872 100644 --- a/ansible/roles/cinder/tasks/config.yml +++ b/ansible/roles/cinder/tasks/config.yml @@ -126,6 +126,3 @@ when: inventory_hostname in groups['cinder-volume'] notify: - Restart cinder-volume container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/cinder/tasks/deploy.yml b/ansible/roles/cinder/tasks/deploy.yml index 07aa8b8..f123f63 100644 --- a/ansible/roles/cinder/tasks/deploy.yml +++ b/ansible/roles/cinder/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: cinder_dev_mode | bool diff --git a/ansible/roles/cinder/tasks/upgrade.yml b/ansible/roles/cinder/tasks/upgrade.yml index cf9c0c1..17bbdae 100644 --- a/ansible/roles/cinder/tasks/upgrade.yml +++ b/ansible/roles/cinder/tasks/upgrade.yml @@ -8,6 +8,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/cloudkitty/tasks/config.yml b/ansible/roles/cloudkitty/tasks/config.yml index a381073..967b8ca 100644 --- a/ansible/roles/cloudkitty/tasks/config.yml +++ b/ansible/roles/cloudkitty/tasks/config.yml @@ -119,6 +119,3 @@ with_dict: "{{ cloudkitty_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/cloudkitty/tasks/deploy.yml b/ansible/roles/cloudkitty/tasks/deploy.yml index 5ecbdb8..821951b 100644 --- a/ansible/roles/cloudkitty/tasks/deploy.yml +++ b/ansible/roles/cloudkitty/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: cloudkitty_dev_mode | bool diff --git a/ansible/roles/cloudkitty/tasks/upgrade.yml b/ansible/roles/cloudkitty/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/cloudkitty/tasks/upgrade.yml +++ b/ansible/roles/cloudkitty/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/collectd/tasks/config.yml b/ansible/roles/collectd/tasks/config.yml index 7c69ce1..6b82fca 100644 --- a/ansible/roles/collectd/tasks/config.yml +++ b/ansible/roles/collectd/tasks/config.yml @@ -56,6 +56,3 @@ - service.enabled | bool notify: - Restart collectd container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/collectd/tasks/deploy.yml b/ansible/roles/collectd/tasks/deploy.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/collectd/tasks/deploy.yml +++ b/ansible/roles/collectd/tasks/deploy.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/collectd/tasks/upgrade.yml b/ansible/roles/collectd/tasks/upgrade.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/collectd/tasks/upgrade.yml +++ b/ansible/roles/collectd/tasks/upgrade.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/common/tasks/config.yml b/ansible/roles/common/tasks/config.yml index 4d40b8d..1d98c74 100644 --- a/ansible/roles/common/tasks/config.yml +++ b/ansible/roles/common/tasks/config.yml @@ -283,6 +283,3 @@ when: - common_services['kolla-toolbox'] | service_enabled_and_mapped_to_host - api_address_family == "ipv6" - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/common/tasks/deploy.yml b/ansible/roles/common/tasks/deploy.yml index 6e56d09..d0b36cb 100644 --- a/ansible/roles/common/tasks/deploy.yml +++ b/ansible/roles/common/tasks/deploy.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap.yml - name: Flush handlers diff --git a/ansible/roles/common/tasks/upgrade.yml b/ansible/roles/common/tasks/upgrade.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/common/tasks/upgrade.yml +++ b/ansible/roles/common/tasks/upgrade.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/cyborg/tasks/config.yml b/ansible/roles/cyborg/tasks/config.yml index 4bfa07d..0c4fa0d 100644 --- a/ansible/roles/cyborg/tasks/config.yml +++ b/ansible/roles/cyborg/tasks/config.yml @@ -96,6 +96,3 @@ - service.enabled | bool notify: - Restart cyborg-api container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/cyborg/tasks/deploy.yml b/ansible/roles/cyborg/tasks/deploy.yml index 19c518a..d793a34 100644 --- a/ansible/roles/cyborg/tasks/deploy.yml +++ b/ansible/roles/cyborg/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap.yml - name: Flush handlers diff --git a/ansible/roles/cyborg/tasks/upgrade.yml b/ansible/roles/cyborg/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/cyborg/tasks/upgrade.yml +++ b/ansible/roles/cyborg/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/designate/tasks/config.yml b/ansible/roles/designate/tasks/config.yml index e2e6914..92a2d47 100644 --- a/ansible/roles/designate/tasks/config.yml +++ b/ansible/roles/designate/tasks/config.yml @@ -151,6 +151,3 @@ with_dict: "{{ designate_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/designate/tasks/deploy.yml b/ansible/roles/designate/tasks/deploy.yml index b6ec40d..b4bd4d3 100644 --- a/ansible/roles/designate/tasks/deploy.yml +++ b/ansible/roles/designate/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: designate_dev_mode | bool diff --git a/ansible/roles/designate/tasks/upgrade.yml b/ansible/roles/designate/tasks/upgrade.yml index 2ccfafe..b87dcfb 100644 --- a/ansible/roles/designate/tasks/upgrade.yml +++ b/ansible/roles/designate/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/elasticsearch/tasks/config.yml b/ansible/roles/elasticsearch/tasks/config.yml index 079327b..630b15e 100644 --- a/ansible/roles/elasticsearch/tasks/config.yml +++ b/ansible/roles/elasticsearch/tasks/config.yml @@ -76,6 +76,3 @@ - service.enabled | bool notify: - Restart elasticsearch-curator container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/elasticsearch/tasks/deploy.yml b/ansible/roles/elasticsearch/tasks/deploy.yml index 982db9c..514002b 100644 --- a/ansible/roles/elasticsearch/tasks/deploy.yml +++ b/ansible/roles/elasticsearch/tasks/deploy.yml @@ -3,5 +3,7 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/elasticsearch/tasks/upgrade.yml b/ansible/roles/elasticsearch/tasks/upgrade.yml index d8fb942..a7b0484 100644 --- a/ansible/roles/elasticsearch/tasks/upgrade.yml +++ b/ansible/roles/elasticsearch/tasks/upgrade.yml @@ -54,5 +54,7 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/etcd/tasks/config.yml b/ansible/roles/etcd/tasks/config.yml index ba22835..e3fc555 100644 --- a/ansible/roles/etcd/tasks/config.yml +++ b/ansible/roles/etcd/tasks/config.yml @@ -28,6 +28,3 @@ - include_tasks: copy-certs.yml when: - etcd_enable_tls | bool - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/etcd/tasks/deploy.yml b/ansible/roles/etcd/tasks/deploy.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/etcd/tasks/deploy.yml +++ b/ansible/roles/etcd/tasks/deploy.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/etcd/tasks/upgrade.yml b/ansible/roles/etcd/tasks/upgrade.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/etcd/tasks/upgrade.yml +++ b/ansible/roles/etcd/tasks/upgrade.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/freezer/tasks/config.yml b/ansible/roles/freezer/tasks/config.yml index ae7620e..b6f4244 100644 --- a/ansible/roles/freezer/tasks/config.yml +++ b/ansible/roles/freezer/tasks/config.yml @@ -95,6 +95,3 @@ with_dict: "{{ freezer_services }}" notify: - "Restart {{ item.key }} container" - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/freezer/tasks/deploy.yml b/ansible/roles/freezer/tasks/deploy.yml index e33a163..1073556 100644 --- a/ansible/roles/freezer/tasks/deploy.yml +++ b/ansible/roles/freezer/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: freezer_dev_mode | bool diff --git a/ansible/roles/freezer/tasks/upgrade.yml b/ansible/roles/freezer/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/freezer/tasks/upgrade.yml +++ b/ansible/roles/freezer/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/glance/tasks/config.yml b/ansible/roles/glance/tasks/config.yml index 43a9e1c..702501d 100644 --- a/ansible/roles/glance/tasks/config.yml +++ b/ansible/roles/glance/tasks/config.yml @@ -185,6 +185,3 @@ - glance_tls_proxy.host_in_groups | bool notify: - Restart glance-tls-proxy container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/glance/tasks/deploy.yml b/ansible/roles/glance/tasks/deploy.yml index 9150e39..3b0a139 100644 --- a/ansible/roles/glance/tasks/deploy.yml +++ b/ansible/roles/glance/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: - glance_dev_mode | bool diff --git a/ansible/roles/glance/tasks/legacy_upgrade.yml b/ansible/roles/glance/tasks/legacy_upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/glance/tasks/legacy_upgrade.yml +++ b/ansible/roles/glance/tasks/legacy_upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/glance/tasks/rolling_upgrade.yml b/ansible/roles/glance/tasks/rolling_upgrade.yml index 59736f2..4fbf1a4 100644 --- a/ansible/roles/glance/tasks/rolling_upgrade.yml +++ b/ansible/roles/glance/tasks/rolling_upgrade.yml @@ -74,6 +74,8 @@ - include_tasks: config.yml when: inventory_hostname != glance_api_hosts[0] +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/gnocchi/tasks/config.yml b/ansible/roles/gnocchi/tasks/config.yml index f97f41c..9844878 100644 --- a/ansible/roles/gnocchi/tasks/config.yml +++ b/ansible/roles/gnocchi/tasks/config.yml @@ -101,6 +101,3 @@ with_dict: "{{ gnocchi_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/gnocchi/tasks/deploy.yml b/ansible/roles/gnocchi/tasks/deploy.yml index 19c518a..d793a34 100644 --- a/ansible/roles/gnocchi/tasks/deploy.yml +++ b/ansible/roles/gnocchi/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap.yml - name: Flush handlers diff --git a/ansible/roles/gnocchi/tasks/upgrade.yml b/ansible/roles/gnocchi/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/gnocchi/tasks/upgrade.yml +++ b/ansible/roles/gnocchi/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/grafana/tasks/config.yml b/ansible/roles/grafana/tasks/config.yml index f9f4f74..0dba359 100644 --- a/ansible/roles/grafana/tasks/config.yml +++ b/ansible/roles/grafana/tasks/config.yml @@ -102,6 +102,3 @@ - "prometheus.yaml.j2" notify: - Restart grafana container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/grafana/tasks/deploy.yml b/ansible/roles/grafana/tasks/deploy.yml index 41c7664..32431aa 100644 --- a/ansible/roles/grafana/tasks/deploy.yml +++ b/ansible/roles/grafana/tasks/deploy.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap.yml - name: Flush handlers diff --git a/ansible/roles/grafana/tasks/upgrade.yml b/ansible/roles/grafana/tasks/upgrade.yml index ae47e4b..e9c7a67 100644 --- a/ansible/roles/grafana/tasks/upgrade.yml +++ b/ansible/roles/grafana/tasks/upgrade.yml @@ -14,6 +14,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + # NOTE(dszumski): We don't want old Grafana instances running after # a new instance has updated the DB schema. Since the first instance # is upgraded first, we stop all the other ones. diff --git a/ansible/roles/haproxy/tasks/config.yml b/ansible/roles/haproxy/tasks/config.yml index 1ca42fb..5c82dbd 100644 --- a/ansible/roles/haproxy/tasks/config.yml +++ b/ansible/roles/haproxy/tasks/config.yml @@ -146,6 +146,3 @@ - "haproxy_run.sh.j2" notify: - Restart haproxy container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/haproxy/tasks/deploy.yml b/ansible/roles/haproxy/tasks/deploy.yml index efc8213..8532ea3 100644 --- a/ansible/roles/haproxy/tasks/deploy.yml +++ b/ansible/roles/haproxy/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + # NOTE(yoctozepto): haproxy role handlers should not be flushed early. # site.yml handles all haproxy things in a dedicated play. # This is to avoid extra haproxy service restart. diff --git a/ansible/roles/heat/tasks/config.yml b/ansible/roles/heat/tasks/config.yml index b2fbdf9..37e6539 100644 --- a/ansible/roles/heat/tasks/config.yml +++ b/ansible/roles/heat/tasks/config.yml @@ -109,6 +109,3 @@ - service.enabled | bool notify: - Restart heat-api-cfn container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/heat/tasks/deploy.yml b/ansible/roles/heat/tasks/deploy.yml index 1adc6a8..9f2a8d8 100644 --- a/ansible/roles/heat/tasks/deploy.yml +++ b/ansible/roles/heat/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: - heat_dev_mode | bool diff --git a/ansible/roles/heat/tasks/upgrade.yml b/ansible/roles/heat/tasks/upgrade.yml index 2089d66..248811d 100644 --- a/ansible/roles/heat/tasks/upgrade.yml +++ b/ansible/roles/heat/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml # NOTE(priteau): Remove this task in V cycle. diff --git a/ansible/roles/horizon/tasks/config.yml b/ansible/roles/horizon/tasks/config.yml index 088c08b..1f5e8ff 100644 --- a/ansible/roles/horizon/tasks/config.yml +++ b/ansible/roles/horizon/tasks/config.yml @@ -135,6 +135,3 @@ - include_tasks: copy-certs.yml when: - kolla_copy_ca_into_containers | bool or horizon_enable_tls_backend | bool - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/horizon/tasks/deploy.yml b/ansible/roles/horizon/tasks/deploy.yml index 3ae46de..2415269 100644 --- a/ansible/roles/horizon/tasks/deploy.yml +++ b/ansible/roles/horizon/tasks/deploy.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: - horizon_dev_mode | bool diff --git a/ansible/roles/horizon/tasks/upgrade.yml b/ansible/roles/horizon/tasks/upgrade.yml index 9542c17..b8b6995 100644 --- a/ansible/roles/horizon/tasks/upgrade.yml +++ b/ansible/roles/horizon/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: - horizon_dev_mode | bool diff --git a/ansible/roles/influxdb/tasks/config.yml b/ansible/roles/influxdb/tasks/config.yml index 3311b7a..841e7ae 100644 --- a/ansible/roles/influxdb/tasks/config.yml +++ b/ansible/roles/influxdb/tasks/config.yml @@ -42,6 +42,3 @@ - "influxdb.conf.j2" notify: - Restart influxdb container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/influxdb/tasks/deploy.yml b/ansible/roles/influxdb/tasks/deploy.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/influxdb/tasks/deploy.yml +++ b/ansible/roles/influxdb/tasks/deploy.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/influxdb/tasks/upgrade.yml b/ansible/roles/influxdb/tasks/upgrade.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/influxdb/tasks/upgrade.yml +++ b/ansible/roles/influxdb/tasks/upgrade.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/ironic/tasks/config.yml b/ansible/roles/ironic/tasks/config.yml index 4541053..fc51e4a 100644 --- a/ansible/roles/ironic/tasks/config.yml +++ b/ansible/roles/ironic/tasks/config.yml @@ -255,6 +255,3 @@ - ironic_services["ironic-api"].enabled | bool notify: - "Restart ironic-api container" - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/ironic/tasks/deploy.yml b/ansible/roles/ironic/tasks/deploy.yml index 1d0a639..bf32d69 100644 --- a/ansible/roles/ironic/tasks/deploy.yml +++ b/ansible/roles/ironic/tasks/deploy.yml @@ -6,6 +6,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.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 35f7abe..ccfc6f3 100644 --- a/ansible/roles/ironic/tasks/legacy_upgrade.yml +++ b/ansible/roles/ironic/tasks/legacy_upgrade.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/ironic/tasks/rolling_upgrade.yml b/ansible/roles/ironic/tasks/rolling_upgrade.yml index 08f2f3a..ad39fba 100644 --- a/ansible/roles/ironic/tasks/rolling_upgrade.yml +++ b/ansible/roles/ironic/tasks/rolling_upgrade.yml @@ -6,6 +6,8 @@ vars: pin_release_version: "{{ openstack_previous_release_name }}" +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml # TODO(donghm): Flush_handlers to restart ironic services @@ -19,6 +21,8 @@ # Unpin version - import_tasks: config.yml +- import_tasks: check-containers.yml + # Restart ironic services with unpinned release version - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/iscsi/tasks/config.yml b/ansible/roles/iscsi/tasks/config.yml index 3485625..1c9da9d 100644 --- a/ansible/roles/iscsi/tasks/config.yml +++ b/ansible/roles/iscsi/tasks/config.yml @@ -24,6 +24,3 @@ with_dict: "{{ iscsi_services }}" notify: - "Restart {{ item.key }} container" - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/iscsi/tasks/deploy.yml b/ansible/roles/iscsi/tasks/deploy.yml index 982db9c..514002b 100644 --- a/ansible/roles/iscsi/tasks/deploy.yml +++ b/ansible/roles/iscsi/tasks/deploy.yml @@ -3,5 +3,7 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/kafka/tasks/config.yml b/ansible/roles/kafka/tasks/config.yml index 6323eb4..5338a89 100644 --- a/ansible/roles/kafka/tasks/config.yml +++ b/ansible/roles/kafka/tasks/config.yml @@ -40,6 +40,3 @@ with_dict: "{{ kafka_services }}" notify: - Restart kafka container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/kafka/tasks/deploy.yml b/ansible/roles/kafka/tasks/deploy.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/kafka/tasks/deploy.yml +++ b/ansible/roles/kafka/tasks/deploy.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/kafka/tasks/upgrade.yml b/ansible/roles/kafka/tasks/upgrade.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/kafka/tasks/upgrade.yml +++ b/ansible/roles/kafka/tasks/upgrade.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/karbor/tasks/config.yml b/ansible/roles/karbor/tasks/config.yml index cde7f68..81125eb 100644 --- a/ansible/roles/karbor/tasks/config.yml +++ b/ansible/roles/karbor/tasks/config.yml @@ -82,6 +82,3 @@ - service.enabled | bool notify: - Restart karbor-protection container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/karbor/tasks/deploy.yml b/ansible/roles/karbor/tasks/deploy.yml index 19c518a..d793a34 100644 --- a/ansible/roles/karbor/tasks/deploy.yml +++ b/ansible/roles/karbor/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap.yml - name: Flush handlers diff --git a/ansible/roles/karbor/tasks/upgrade.yml b/ansible/roles/karbor/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/karbor/tasks/upgrade.yml +++ b/ansible/roles/karbor/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/keystone/tasks/config.yml b/ansible/roles/keystone/tasks/config.yml index f4532c6..06ecea3 100644 --- a/ansible/roles/keystone/tasks/config.yml +++ b/ansible/roles/keystone/tasks/config.yml @@ -243,6 +243,3 @@ - keystone_ssh.enabled | bool notify: - Restart keystone-ssh container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/keystone/tasks/deploy.yml b/ansible/roles/keystone/tasks/deploy.yml index 7b389b4..656e44e 100644 --- a/ansible/roles/keystone/tasks/deploy.yml +++ b/ansible/roles/keystone/tasks/deploy.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: - keystone_dev_mode | bool diff --git a/ansible/roles/keystone/tasks/upgrade.yml b/ansible/roles/keystone/tasks/upgrade.yml index ca1d509..8f98db1 100644 --- a/ansible/roles/keystone/tasks/upgrade.yml +++ b/ansible/roles/keystone/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Enable log_bin_trust_function_creators function become: true kolla_toolbox: diff --git a/ansible/roles/kibana/tasks/config.yml b/ansible/roles/kibana/tasks/config.yml index 82b89ce..6623f35 100644 --- a/ansible/roles/kibana/tasks/config.yml +++ b/ansible/roles/kibana/tasks/config.yml @@ -46,6 +46,3 @@ - kibana.enabled | bool notify: - Restart kibana container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/kibana/tasks/deploy.yml b/ansible/roles/kibana/tasks/deploy.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/kibana/tasks/deploy.yml +++ b/ansible/roles/kibana/tasks/deploy.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/kibana/tasks/upgrade.yml b/ansible/roles/kibana/tasks/upgrade.yml index 710d796..175913a 100644 --- a/ansible/roles/kibana/tasks/upgrade.yml +++ b/ansible/roles/kibana/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: migrate-kibana-index.yml - name: Flush handlers diff --git a/ansible/roles/kuryr/tasks/config.yml b/ansible/roles/kuryr/tasks/config.yml index eab990e..c059713 100644 --- a/ansible/roles/kuryr/tasks/config.yml +++ b/ansible/roles/kuryr/tasks/config.yml @@ -97,6 +97,3 @@ with_dict: "{{ kuryr_services }}" notify: - Restart kuryr container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/kuryr/tasks/deploy.yml b/ansible/roles/kuryr/tasks/deploy.yml index 65f7c8e..d253fcb 100644 --- a/ansible/roles/kuryr/tasks/deploy.yml +++ b/ansible/roles/kuryr/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: - kuryr_dev_mode | bool diff --git a/ansible/roles/kuryr/tasks/upgrade.yml b/ansible/roles/kuryr/tasks/upgrade.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/kuryr/tasks/upgrade.yml +++ b/ansible/roles/kuryr/tasks/upgrade.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/magnum/tasks/config.yml b/ansible/roles/magnum/tasks/config.yml index b26234d..c299631 100644 --- a/ansible/roles/magnum/tasks/config.yml +++ b/ansible/roles/magnum/tasks/config.yml @@ -81,6 +81,3 @@ with_dict: "{{ magnum_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/magnum/tasks/deploy.yml b/ansible/roles/magnum/tasks/deploy.yml index 8b4eba8..b6c9648 100644 --- a/ansible/roles/magnum/tasks/deploy.yml +++ b/ansible/roles/magnum/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: magnum_dev_mode | bool diff --git a/ansible/roles/magnum/tasks/upgrade.yml b/ansible/roles/magnum/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/magnum/tasks/upgrade.yml +++ b/ansible/roles/magnum/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/manila/tasks/config.yml b/ansible/roles/manila/tasks/config.yml index 26c55bf..bf2929c 100644 --- a/ansible/roles/manila/tasks/config.yml +++ b/ansible/roles/manila/tasks/config.yml @@ -110,6 +110,3 @@ with_dict: "{{ manila_services }}" notify: - "Restart {{ item.key }} container" - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/manila/tasks/deploy.yml b/ansible/roles/manila/tasks/deploy.yml index ea83bb2..7f09243 100644 --- a/ansible/roles/manila/tasks/deploy.yml +++ b/ansible/roles/manila/tasks/deploy.yml @@ -6,6 +6,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap.yml - name: Flush handlers diff --git a/ansible/roles/manila/tasks/upgrade.yml b/ansible/roles/manila/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/manila/tasks/upgrade.yml +++ b/ansible/roles/manila/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/mariadb/tasks/config.yml b/ansible/roles/mariadb/tasks/config.yml index b305f90..5e62381 100644 --- a/ansible/roles/mariadb/tasks/config.yml +++ b/ansible/roles/mariadb/tasks/config.yml @@ -109,6 +109,3 @@ - service.enabled | bool notify: - restart mariadb-clustercheck - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/mariadb/tasks/deploy.yml b/ansible/roles/mariadb/tasks/deploy.yml index b9acd63..9e2d1d8 100644 --- a/ansible/roles/mariadb/tasks/deploy.yml +++ b/ansible/roles/mariadb/tasks/deploy.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap.yml - name: Flush handlers diff --git a/ansible/roles/masakari/tasks/config.yml b/ansible/roles/masakari/tasks/config.yml index 043b0b4..4e664e3 100644 --- a/ansible/roles/masakari/tasks/config.yml +++ b/ansible/roles/masakari/tasks/config.yml @@ -131,6 +131,3 @@ - service.enabled | bool notify: - Restart masakari-api container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/masakari/tasks/deploy.yml b/ansible/roles/masakari/tasks/deploy.yml index 90cb893..e8edec1 100644 --- a/ansible/roles/masakari/tasks/deploy.yml +++ b/ansible/roles/masakari/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: masakari_dev_mode | bool diff --git a/ansible/roles/masakari/tasks/upgrade.yml b/ansible/roles/masakari/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/masakari/tasks/upgrade.yml +++ b/ansible/roles/masakari/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/memcached/tasks/config.yml b/ansible/roles/memcached/tasks/config.yml index 8aeeea3..20edb14 100644 --- a/ansible/roles/memcached/tasks/config.yml +++ b/ansible/roles/memcached/tasks/config.yml @@ -24,6 +24,3 @@ - inventory_hostname in groups[service.group] - service.enabled | bool notify: Restart memcached container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/memcached/tasks/deploy.yml b/ansible/roles/memcached/tasks/deploy.yml index abd540e..651076c 100644 --- a/ansible/roles/memcached/tasks/deploy.yml +++ b/ansible/roles/memcached/tasks/deploy.yml @@ -1,2 +1,4 @@ --- - import_tasks: config.yml + +- import_tasks: check-containers.yml diff --git a/ansible/roles/memcached/tasks/upgrade.yml b/ansible/roles/memcached/tasks/upgrade.yml index abd540e..651076c 100644 --- a/ansible/roles/memcached/tasks/upgrade.yml +++ b/ansible/roles/memcached/tasks/upgrade.yml @@ -1,2 +1,4 @@ --- - import_tasks: config.yml + +- import_tasks: check-containers.yml diff --git a/ansible/roles/mistral/tasks/config.yml b/ansible/roles/mistral/tasks/config.yml index e7f92bd..3f30bb6 100644 --- a/ansible/roles/mistral/tasks/config.yml +++ b/ansible/roles/mistral/tasks/config.yml @@ -99,6 +99,3 @@ - "{{ role_path }}/templates/event_definitions.yaml.j2" notify: - "Restart mistral-event-engine container" - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/mistral/tasks/deploy.yml b/ansible/roles/mistral/tasks/deploy.yml index 05886fc..e0c2b34 100644 --- a/ansible/roles/mistral/tasks/deploy.yml +++ b/ansible/roles/mistral/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: mistral_dev_mode | bool diff --git a/ansible/roles/mistral/tasks/upgrade.yml b/ansible/roles/mistral/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/mistral/tasks/upgrade.yml +++ b/ansible/roles/mistral/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/monasca/tasks/config.yml b/ansible/roles/monasca/tasks/config.yml index 6e3e409..ed1f691 100644 --- a/ansible/roles/monasca/tasks/config.yml +++ b/ansible/roles/monasca/tasks/config.yml @@ -384,6 +384,3 @@ - service.enabled | bool notify: - Restart monasca-grafana container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/monasca/tasks/deploy.yml b/ansible/roles/monasca/tasks/deploy.yml index b3912ad..49b8065 100644 --- a/ansible/roles/monasca/tasks/deploy.yml +++ b/ansible/roles/monasca/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap.yml - name: Flush handlers diff --git a/ansible/roles/monasca/tasks/upgrade.yml b/ansible/roles/monasca/tasks/upgrade.yml index 32f755c..20eeaaf 100644 --- a/ansible/roles/monasca/tasks/upgrade.yml +++ b/ansible/roles/monasca/tasks/upgrade.yml @@ -14,6 +14,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + # NOTE(dszumski): We don't want old Grafana instances running after # a new instance has updated the DB schema. Since the first instance # is upgraded first, we stop all the other ones. diff --git a/ansible/roles/multipathd/tasks/config.yml b/ansible/roles/multipathd/tasks/config.yml index e5f70d4..6668405 100644 --- a/ansible/roles/multipathd/tasks/config.yml +++ b/ansible/roles/multipathd/tasks/config.yml @@ -37,6 +37,3 @@ with_dict: "{{ multipathd_services }}" notify: - Restart multipathd container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/multipathd/tasks/deploy.yml b/ansible/roles/multipathd/tasks/deploy.yml index 982db9c..514002b 100644 --- a/ansible/roles/multipathd/tasks/deploy.yml +++ b/ansible/roles/multipathd/tasks/deploy.yml @@ -3,5 +3,7 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/multipathd/tasks/upgrade.yml b/ansible/roles/multipathd/tasks/upgrade.yml index 982db9c..514002b 100644 --- a/ansible/roles/multipathd/tasks/upgrade.yml +++ b/ansible/roles/multipathd/tasks/upgrade.yml @@ -3,5 +3,7 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/murano/tasks/config.yml b/ansible/roles/murano/tasks/config.yml index f46e8ba..8f26465 100644 --- a/ansible/roles/murano/tasks/config.yml +++ b/ansible/roles/murano/tasks/config.yml @@ -80,6 +80,3 @@ with_dict: "{{ murano_services }}" notify: - "Restart {{ item.key }} container" - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/murano/tasks/deploy.yml b/ansible/roles/murano/tasks/deploy.yml index 7c092c2..a039004 100644 --- a/ansible/roles/murano/tasks/deploy.yml +++ b/ansible/roles/murano/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: - murano_dev_mode | bool diff --git a/ansible/roles/murano/tasks/upgrade.yml b/ansible/roles/murano/tasks/upgrade.yml index fa9fd68..7d9c287 100644 --- a/ansible/roles/murano/tasks/upgrade.yml +++ b/ansible/roles/murano/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml index 189e033..1154022 100644 --- a/ansible/roles/neutron/tasks/config.yml +++ b/ansible/roles/neutron/tasks/config.yml @@ -469,7 +469,3 @@ - neutron_tls_proxy.host_in_groups | bool notify: - Restart neutron-tls-proxy container - - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/neutron/tasks/deploy.yml b/ansible/roles/neutron/tasks/deploy.yml index 70ec741..49d79e2 100644 --- a/ansible/roles/neutron/tasks/deploy.yml +++ b/ansible/roles/neutron/tasks/deploy.yml @@ -8,6 +8,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: config-neutron-fake.yml when: - enable_nova_fake | bool diff --git a/ansible/roles/neutron/tasks/legacy_upgrade.yml b/ansible/roles/neutron/tasks/legacy_upgrade.yml index 7d3ba6c..21f682c 100644 --- a/ansible/roles/neutron/tasks/legacy_upgrade.yml +++ b/ansible/roles/neutron/tasks/legacy_upgrade.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: config-neutron-fake.yml when: - inventory_hostname in groups['compute'] diff --git a/ansible/roles/neutron/tasks/rolling_upgrade.yml b/ansible/roles/neutron/tasks/rolling_upgrade.yml index f3512c2..cada9e1 100644 --- a/ansible/roles/neutron/tasks/rolling_upgrade.yml +++ b/ansible/roles/neutron/tasks/rolling_upgrade.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: config-neutron-fake.yml when: - inventory_hostname in groups['compute'] diff --git a/ansible/roles/nova-cell/tasks/config.yml b/ansible/roles/nova-cell/tasks/config.yml index f5ca017..8e4a2c2 100644 --- a/ansible/roles/nova-cell/tasks/config.yml +++ b/ansible/roles/nova-cell/tasks/config.yml @@ -164,6 +164,3 @@ with_dict: "{{ nova_cell_services }}" notify: - "Restart {{ item.key }} container" - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/nova-cell/tasks/deploy.yml b/ansible/roles/nova-cell/tasks/deploy.yml index 20a9d8a..795739f 100644 --- a/ansible/roles/nova-cell/tasks/deploy.yml +++ b/ansible/roles/nova-cell/tasks/deploy.yml @@ -6,6 +6,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: config-nova-fake.yml when: - enable_nova_fake | bool diff --git a/ansible/roles/nova-cell/tasks/rolling_upgrade.yml b/ansible/roles/nova-cell/tasks/rolling_upgrade.yml index c53a845..b1637ad 100644 --- a/ansible/roles/nova-cell/tasks/rolling_upgrade.yml +++ b/ansible/roles/nova-cell/tasks/rolling_upgrade.yml @@ -5,6 +5,8 @@ # Create new set of configs on nodes - import_tasks: config.yml +- import_tasks: check-containers.yml + # TODO(donghm): Flush_handlers to restart nova services # should be run in serial nodes to decrease downtime if # the previous task did not run. Update when the diff --git a/ansible/roles/nova/tasks/config.yml b/ansible/roles/nova/tasks/config.yml index bfd41be..dd75b5a 100644 --- a/ansible/roles/nova/tasks/config.yml +++ b/ansible/roles/nova/tasks/config.yml @@ -94,6 +94,3 @@ - nova_services["nova-api"].enabled | bool notify: - "Restart nova-api container" - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/nova/tasks/deploy.yml b/ansible/roles/nova/tasks/deploy.yml index aa0718b..9155c24 100644 --- a/ansible/roles/nova/tasks/deploy.yml +++ b/ansible/roles/nova/tasks/deploy.yml @@ -3,5 +3,7 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/nova/tasks/rolling_upgrade.yml b/ansible/roles/nova/tasks/rolling_upgrade.yml index a8d45b4..1a2c675 100644 --- a/ansible/roles/nova/tasks/rolling_upgrade.yml +++ b/ansible/roles/nova/tasks/rolling_upgrade.yml @@ -2,6 +2,8 @@ # Create new set of configs on nodes - import_tasks: config.yml +- import_tasks: check-containers.yml + # TODO(donghm): Flush_handlers to restart nova services # should be run in serial nodes to decrease downtime if # the previous task did not run. Update when the diff --git a/ansible/roles/octavia/tasks/config.yml b/ansible/roles/octavia/tasks/config.yml index 3b35613..b45adf4 100644 --- a/ansible/roles/octavia/tasks/config.yml +++ b/ansible/roles/octavia/tasks/config.yml @@ -148,6 +148,3 @@ - server_ca.key.pem notify: - Restart octavia-health-manager container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/octavia/tasks/deploy.yml b/ansible/roles/octavia/tasks/deploy.yml index da8bbcc..c165f26 100644 --- a/ansible/roles/octavia/tasks/deploy.yml +++ b/ansible/roles/octavia/tasks/deploy.yml @@ -6,6 +6,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: octavia_dev_mode | bool diff --git a/ansible/roles/octavia/tasks/upgrade.yml b/ansible/roles/octavia/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/octavia/tasks/upgrade.yml +++ b/ansible/roles/octavia/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/openvswitch/tasks/config.yml b/ansible/roles/openvswitch/tasks/config.yml index f9cf6ba..4089234 100644 --- a/ansible/roles/openvswitch/tasks/config.yml +++ b/ansible/roles/openvswitch/tasks/config.yml @@ -52,6 +52,3 @@ - service.enabled | bool notify: - "Restart openvswitch-db-server container" - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/openvswitch/tasks/deploy.yml b/ansible/roles/openvswitch/tasks/deploy.yml index 2c80a0f..5db4439 100644 --- a/ansible/roles/openvswitch/tasks/deploy.yml +++ b/ansible/roles/openvswitch/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush Handlers meta: flush_handlers diff --git a/ansible/roles/openvswitch/tasks/upgrade.yml b/ansible/roles/openvswitch/tasks/upgrade.yml index 2c80a0f..5db4439 100644 --- a/ansible/roles/openvswitch/tasks/upgrade.yml +++ b/ansible/roles/openvswitch/tasks/upgrade.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush Handlers meta: flush_handlers diff --git a/ansible/roles/ovn/tasks/config.yml b/ansible/roles/ovn/tasks/config.yml index f8e8daf..4731d58 100644 --- a/ansible/roles/ovn/tasks/config.yml +++ b/ansible/roles/ovn/tasks/config.yml @@ -24,6 +24,3 @@ with_dict: "{{ ovn_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/ovn/tasks/deploy.yml b/ansible/roles/ovn/tasks/deploy.yml index 6e56d09..d0b36cb 100644 --- a/ansible/roles/ovn/tasks/deploy.yml +++ b/ansible/roles/ovn/tasks/deploy.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap.yml - name: Flush handlers diff --git a/ansible/roles/ovn/tasks/upgrade.yml b/ansible/roles/ovn/tasks/upgrade.yml index 6e56d09..d0b36cb 100644 --- a/ansible/roles/ovn/tasks/upgrade.yml +++ b/ansible/roles/ovn/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap.yml - name: Flush handlers diff --git a/ansible/roles/ovs-dpdk/tasks/config.yml b/ansible/roles/ovs-dpdk/tasks/config.yml index ff991f8..8d6adc5 100644 --- a/ansible/roles/ovs-dpdk/tasks/config.yml +++ b/ansible/roles/ovs-dpdk/tasks/config.yml @@ -54,6 +54,3 @@ ovs_socket_mem: "{{ ovs_socket_mem }}" hugepage_mountpoint: "{{ ovs_hugepage_mountpoint }}" ovs_physical_port_policy: "{{ ovs_physical_port_policy }}" - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/ovs-dpdk/tasks/deploy.yml b/ansible/roles/ovs-dpdk/tasks/deploy.yml index 56ef2c0..682ed3e 100644 --- a/ansible/roles/ovs-dpdk/tasks/deploy.yml +++ b/ansible/roles/ovs-dpdk/tasks/deploy.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush Handlers meta: flush_handlers diff --git a/ansible/roles/panko/tasks/config.yml b/ansible/roles/panko/tasks/config.yml index f78ece8..97bcabf 100644 --- a/ansible/roles/panko/tasks/config.yml +++ b/ansible/roles/panko/tasks/config.yml @@ -95,6 +95,3 @@ with_dict: "{{ panko_services }}" notify: - Restart panko-api container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/panko/tasks/deploy.yml b/ansible/roles/panko/tasks/deploy.yml index 19c518a..d793a34 100644 --- a/ansible/roles/panko/tasks/deploy.yml +++ b/ansible/roles/panko/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap.yml - name: Flush handlers diff --git a/ansible/roles/panko/tasks/upgrade.yml b/ansible/roles/panko/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/panko/tasks/upgrade.yml +++ b/ansible/roles/panko/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/placement/tasks/config.yml b/ansible/roles/placement/tasks/config.yml index d29f8cf..a176107 100644 --- a/ansible/roles/placement/tasks/config.yml +++ b/ansible/roles/placement/tasks/config.yml @@ -113,6 +113,3 @@ with_dict: "{{ placement_services }}" notify: - "Restart {{ item.key }} container" - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/placement/tasks/deploy.yml b/ansible/roles/placement/tasks/deploy.yml index 035a67e..504031a 100644 --- a/ansible/roles/placement/tasks/deploy.yml +++ b/ansible/roles/placement/tasks/deploy.yml @@ -6,6 +6,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap.yml - name: Flush handlers diff --git a/ansible/roles/placement/tasks/upgrade.yml b/ansible/roles/placement/tasks/upgrade.yml index 06be0b3..7e98e01 100644 --- a/ansible/roles/placement/tasks/upgrade.yml +++ b/ansible/roles/placement/tasks/upgrade.yml @@ -6,6 +6,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap.yml - name: Flush handlers diff --git a/ansible/roles/prometheus/tasks/config.yml b/ansible/roles/prometheus/tasks/config.yml index eb54e47..2140f35 100644 --- a/ansible/roles/prometheus/tasks/config.yml +++ b/ansible/roles/prometheus/tasks/config.yml @@ -212,6 +212,3 @@ when: - inventory_hostname in groups[service.group] - service.enabled | bool - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/prometheus/tasks/deploy.yml b/ansible/roles/prometheus/tasks/deploy.yml index 6e56d09..d0b36cb 100644 --- a/ansible/roles/prometheus/tasks/deploy.yml +++ b/ansible/roles/prometheus/tasks/deploy.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap.yml - name: Flush handlers diff --git a/ansible/roles/prometheus/tasks/upgrade.yml b/ansible/roles/prometheus/tasks/upgrade.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/prometheus/tasks/upgrade.yml +++ b/ansible/roles/prometheus/tasks/upgrade.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/qdrouterd/tasks/config.yml b/ansible/roles/qdrouterd/tasks/config.yml index 178ee2d..ff426f1 100644 --- a/ansible/roles/qdrouterd/tasks/config.yml +++ b/ansible/roles/qdrouterd/tasks/config.yml @@ -60,6 +60,3 @@ - "qdrouterd-sasl.conf.j2" notify: - Restart qdrouterd container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/qdrouterd/tasks/deploy.yml b/ansible/roles/qdrouterd/tasks/deploy.yml index 5e5cf17..5b19eea 100644 --- a/ansible/roles/qdrouterd/tasks/deploy.yml +++ b/ansible/roles/qdrouterd/tasks/deploy.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/qdrouterd/tasks/upgrade.yml b/ansible/roles/qdrouterd/tasks/upgrade.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/qdrouterd/tasks/upgrade.yml +++ b/ansible/roles/qdrouterd/tasks/upgrade.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/qinling/tasks/config.yml b/ansible/roles/qinling/tasks/config.yml index ba23384..625f9aa 100644 --- a/ansible/roles/qinling/tasks/config.yml +++ b/ansible/roles/qinling/tasks/config.yml @@ -100,6 +100,3 @@ with_dict: "{{ qinling_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/qinling/tasks/deploy.yml b/ansible/roles/qinling/tasks/deploy.yml index 4316e67..de9d814 100644 --- a/ansible/roles/qinling/tasks/deploy.yml +++ b/ansible/roles/qinling/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: qinling_dev_mode | bool diff --git a/ansible/roles/qinling/tasks/upgrade.yml b/ansible/roles/qinling/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/qinling/tasks/upgrade.yml +++ b/ansible/roles/qinling/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/rabbitmq/tasks/config.yml b/ansible/roles/rabbitmq/tasks/config.yml index 9e9f4f2..df8c0cd 100644 --- a/ansible/roles/rabbitmq/tasks/config.yml +++ b/ansible/roles/rabbitmq/tasks/config.yml @@ -99,6 +99,3 @@ - include_tasks: copy-certs.yml when: rabbitmq_enable_tls | bool - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/rabbitmq/tasks/deploy.yml b/ansible/roles/rabbitmq/tasks/deploy.yml index 6e56d09..d0b36cb 100644 --- a/ansible/roles/rabbitmq/tasks/deploy.yml +++ b/ansible/roles/rabbitmq/tasks/deploy.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap.yml - name: Flush handlers diff --git a/ansible/roles/rabbitmq/tasks/upgrade.yml b/ansible/roles/rabbitmq/tasks/upgrade.yml index ba7856a..6afca05 100644 --- a/ansible/roles/rabbitmq/tasks/upgrade.yml +++ b/ansible/roles/rabbitmq/tasks/upgrade.yml @@ -18,6 +18,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Stopping all rabbitmq instances but the first node become: true kolla_docker: diff --git a/ansible/roles/rally/tasks/config.yml b/ansible/roles/rally/tasks/config.yml index d533142..31338a4 100644 --- a/ansible/roles/rally/tasks/config.yml +++ b/ansible/roles/rally/tasks/config.yml @@ -78,6 +78,3 @@ with_dict: "{{ rally_services }}" notify: - Restart rally container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/rally/tasks/deploy.yml b/ansible/roles/rally/tasks/deploy.yml index 6e56d09..d0b36cb 100644 --- a/ansible/roles/rally/tasks/deploy.yml +++ b/ansible/roles/rally/tasks/deploy.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap.yml - name: Flush handlers diff --git a/ansible/roles/rally/tasks/upgrade.yml b/ansible/roles/rally/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/rally/tasks/upgrade.yml +++ b/ansible/roles/rally/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/redis/tasks/config.yml b/ansible/roles/redis/tasks/config.yml index 6c8a9d4..e6cfc00 100644 --- a/ansible/roles/redis/tasks/config.yml +++ b/ansible/roles/redis/tasks/config.yml @@ -37,6 +37,3 @@ with_dict: "{{ redis_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/redis/tasks/deploy.yml b/ansible/roles/redis/tasks/deploy.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/redis/tasks/deploy.yml +++ b/ansible/roles/redis/tasks/deploy.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/redis/tasks/upgrade.yml b/ansible/roles/redis/tasks/upgrade.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/redis/tasks/upgrade.yml +++ b/ansible/roles/redis/tasks/upgrade.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/sahara/tasks/config.yml b/ansible/roles/sahara/tasks/config.yml index 578a9ad..bed6647 100644 --- a/ansible/roles/sahara/tasks/config.yml +++ b/ansible/roles/sahara/tasks/config.yml @@ -81,6 +81,3 @@ with_dict: "{{ sahara_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/sahara/tasks/deploy.yml b/ansible/roles/sahara/tasks/deploy.yml index c859769..968cdfe 100644 --- a/ansible/roles/sahara/tasks/deploy.yml +++ b/ansible/roles/sahara/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: sahara_dev_mode | bool diff --git a/ansible/roles/sahara/tasks/upgrade.yml b/ansible/roles/sahara/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/sahara/tasks/upgrade.yml +++ b/ansible/roles/sahara/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/searchlight/tasks/config.yml b/ansible/roles/searchlight/tasks/config.yml index 374218c..5b661eb 100644 --- a/ansible/roles/searchlight/tasks/config.yml +++ b/ansible/roles/searchlight/tasks/config.yml @@ -80,6 +80,3 @@ with_dict: "{{ searchlight_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/searchlight/tasks/deploy.yml b/ansible/roles/searchlight/tasks/deploy.yml index 19c518a..d793a34 100644 --- a/ansible/roles/searchlight/tasks/deploy.yml +++ b/ansible/roles/searchlight/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap.yml - name: Flush handlers diff --git a/ansible/roles/searchlight/tasks/upgrade.yml b/ansible/roles/searchlight/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/searchlight/tasks/upgrade.yml +++ b/ansible/roles/searchlight/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/senlin/tasks/config.yml b/ansible/roles/senlin/tasks/config.yml index 793ee6f..34e0ea3 100644 --- a/ansible/roles/senlin/tasks/config.yml +++ b/ansible/roles/senlin/tasks/config.yml @@ -81,6 +81,3 @@ with_dict: "{{ senlin_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/senlin/tasks/deploy.yml b/ansible/roles/senlin/tasks/deploy.yml index 9abd1ce..3b9ca1e 100644 --- a/ansible/roles/senlin/tasks/deploy.yml +++ b/ansible/roles/senlin/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: senlin_dev_mode | bool diff --git a/ansible/roles/senlin/tasks/upgrade.yml b/ansible/roles/senlin/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/senlin/tasks/upgrade.yml +++ b/ansible/roles/senlin/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/skydive/tasks/config.yml b/ansible/roles/skydive/tasks/config.yml index 46b85db..c58404f 100644 --- a/ansible/roles/skydive/tasks/config.yml +++ b/ansible/roles/skydive/tasks/config.yml @@ -45,6 +45,3 @@ with_dict: "{{ skydive_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/skydive/tasks/deploy.yml b/ansible/roles/skydive/tasks/deploy.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/skydive/tasks/deploy.yml +++ b/ansible/roles/skydive/tasks/deploy.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/skydive/tasks/upgrade.yml b/ansible/roles/skydive/tasks/upgrade.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/skydive/tasks/upgrade.yml +++ b/ansible/roles/skydive/tasks/upgrade.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/solum/tasks/config.yml b/ansible/roles/solum/tasks/config.yml index 043abc1..9b3ff80 100644 --- a/ansible/roles/solum/tasks/config.yml +++ b/ansible/roles/solum/tasks/config.yml @@ -48,6 +48,3 @@ with_dict: "{{ solum_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/solum/tasks/deploy.yml b/ansible/roles/solum/tasks/deploy.yml index e888713..3d2bb2f 100644 --- a/ansible/roles/solum/tasks/deploy.yml +++ b/ansible/roles/solum/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: solum_dev_mode | bool diff --git a/ansible/roles/solum/tasks/upgrade.yml b/ansible/roles/solum/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/solum/tasks/upgrade.yml +++ b/ansible/roles/solum/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/storm/tasks/config.yml b/ansible/roles/storm/tasks/config.yml index 516cf1a..39301da 100644 --- a/ansible/roles/storm/tasks/config.yml +++ b/ansible/roles/storm/tasks/config.yml @@ -60,6 +60,3 @@ - service.enabled | bool notify: - Restart storm-nimbus container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/storm/tasks/deploy.yml b/ansible/roles/storm/tasks/deploy.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/storm/tasks/deploy.yml +++ b/ansible/roles/storm/tasks/deploy.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/tacker/tasks/config.yml b/ansible/roles/tacker/tasks/config.yml index cb69ef7..ecdf54d 100644 --- a/ansible/roles/tacker/tasks/config.yml +++ b/ansible/roles/tacker/tasks/config.yml @@ -81,6 +81,3 @@ with_dict: "{{ tacker_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/tacker/tasks/deploy.yml b/ansible/roles/tacker/tasks/deploy.yml index 743fb8c..e1b6b66 100644 --- a/ansible/roles/tacker/tasks/deploy.yml +++ b/ansible/roles/tacker/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: - tacker_dev_mode | bool diff --git a/ansible/roles/tacker/tasks/upgrade.yml b/ansible/roles/tacker/tasks/upgrade.yml index 0b64243..4a53114 100644 --- a/ansible/roles/tacker/tasks/upgrade.yml +++ b/ansible/roles/tacker/tasks/upgrade.yml @@ -32,6 +32,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/telegraf/tasks/config.yml b/ansible/roles/telegraf/tasks/config.yml index 61d35ed..a0a947f 100644 --- a/ansible/roles/telegraf/tasks/config.yml +++ b/ansible/roles/telegraf/tasks/config.yml @@ -62,6 +62,3 @@ - "{{ role_path }}/templates/config/*.conf" notify: - Restart telegraf container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/telegraf/tasks/deploy.yml b/ansible/roles/telegraf/tasks/deploy.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/telegraf/tasks/deploy.yml +++ b/ansible/roles/telegraf/tasks/deploy.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/telegraf/tasks/upgrade.yml b/ansible/roles/telegraf/tasks/upgrade.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/telegraf/tasks/upgrade.yml +++ b/ansible/roles/telegraf/tasks/upgrade.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/tempest/tasks/config.yml b/ansible/roles/tempest/tasks/config.yml index a9ce4d9..eee1993 100644 --- a/ansible/roles/tempest/tasks/config.yml +++ b/ansible/roles/tempest/tasks/config.yml @@ -45,6 +45,3 @@ with_dict: "{{ tempest_services }}" notify: - Restart tempest container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/tempest/tasks/deploy.yml b/ansible/roles/tempest/tasks/deploy.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/tempest/tasks/deploy.yml +++ b/ansible/roles/tempest/tasks/deploy.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/tempest/tasks/upgrade.yml b/ansible/roles/tempest/tasks/upgrade.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/tempest/tasks/upgrade.yml +++ b/ansible/roles/tempest/tasks/upgrade.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/trove/tasks/config.yml b/ansible/roles/trove/tasks/config.yml index ddbacba..be29058 100644 --- a/ansible/roles/trove/tasks/config.yml +++ b/ansible/roles/trove/tasks/config.yml @@ -123,6 +123,3 @@ with_dict: "{{ trove_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/trove/tasks/deploy.yml b/ansible/roles/trove/tasks/deploy.yml index 1a845e8..e0323b3 100644 --- a/ansible/roles/trove/tasks/deploy.yml +++ b/ansible/roles/trove/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: trove_dev_mode | bool diff --git a/ansible/roles/trove/tasks/upgrade.yml b/ansible/roles/trove/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/trove/tasks/upgrade.yml +++ b/ansible/roles/trove/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/vitrage/tasks/config.yml b/ansible/roles/vitrage/tasks/config.yml index a20e3db..60d68e4 100644 --- a/ansible/roles/vitrage/tasks/config.yml +++ b/ansible/roles/vitrage/tasks/config.yml @@ -108,6 +108,3 @@ with_dict: "{{ vitrage_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/vitrage/tasks/deploy.yml b/ansible/roles/vitrage/tasks/deploy.yml index 91e701b..28649bc 100644 --- a/ansible/roles/vitrage/tasks/deploy.yml +++ b/ansible/roles/vitrage/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: vitrage_dev_mode | bool diff --git a/ansible/roles/vitrage/tasks/upgrade.yml b/ansible/roles/vitrage/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/vitrage/tasks/upgrade.yml +++ b/ansible/roles/vitrage/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/vmtp/tasks/config.yml b/ansible/roles/vmtp/tasks/config.yml index 66009ab..b0c1ac7 100644 --- a/ansible/roles/vmtp/tasks/config.yml +++ b/ansible/roles/vmtp/tasks/config.yml @@ -30,6 +30,3 @@ - "cfg.default.yaml" notify: - Restart vmtp container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/vmtp/tasks/deploy.yml b/ansible/roles/vmtp/tasks/deploy.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/vmtp/tasks/deploy.yml +++ b/ansible/roles/vmtp/tasks/deploy.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/vmtp/tasks/upgrade.yml b/ansible/roles/vmtp/tasks/upgrade.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/vmtp/tasks/upgrade.yml +++ b/ansible/roles/vmtp/tasks/upgrade.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/watcher/tasks/config.yml b/ansible/roles/watcher/tasks/config.yml index 6ff9f84..a634d03 100644 --- a/ansible/roles/watcher/tasks/config.yml +++ b/ansible/roles/watcher/tasks/config.yml @@ -78,6 +78,3 @@ with_dict: "{{ watcher_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/watcher/tasks/deploy.yml b/ansible/roles/watcher/tasks/deploy.yml index 650560a..f7c2f45 100644 --- a/ansible/roles/watcher/tasks/deploy.yml +++ b/ansible/roles/watcher/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: watcher_dev_mode | bool diff --git a/ansible/roles/watcher/tasks/upgrade.yml b/ansible/roles/watcher/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/watcher/tasks/upgrade.yml +++ b/ansible/roles/watcher/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers diff --git a/ansible/roles/zookeeper/tasks/config.yml b/ansible/roles/zookeeper/tasks/config.yml index 7e97996..abbf45a 100644 --- a/ansible/roles/zookeeper/tasks/config.yml +++ b/ansible/roles/zookeeper/tasks/config.yml @@ -53,6 +53,3 @@ with_dict: "{{ zookeeper_services }}" notify: - Restart zookeeper container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/zookeeper/tasks/deploy.yml b/ansible/roles/zookeeper/tasks/deploy.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/zookeeper/tasks/deploy.yml +++ b/ansible/roles/zookeeper/tasks/deploy.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/zookeeper/tasks/upgrade.yml b/ansible/roles/zookeeper/tasks/upgrade.yml index 8f7f4dd..49edff8 100644 --- a/ansible/roles/zookeeper/tasks/upgrade.yml +++ b/ansible/roles/zookeeper/tasks/upgrade.yml @@ -1,5 +1,7 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - name: Flush handlers meta: flush_handlers diff --git a/ansible/roles/zun/tasks/config.yml b/ansible/roles/zun/tasks/config.yml index cd149c4..f0c34a0 100644 --- a/ansible/roles/zun/tasks/config.yml +++ b/ansible/roles/zun/tasks/config.yml @@ -94,6 +94,3 @@ with_dict: "{{ zun_services }}" notify: - Restart {{ item.key }} container - -- import_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/zun/tasks/deploy.yml b/ansible/roles/zun/tasks/deploy.yml index 85e2a8b..7e14eb0 100644 --- a/ansible/roles/zun/tasks/deploy.yml +++ b/ansible/roles/zun/tasks/deploy.yml @@ -3,6 +3,8 @@ - import_tasks: config.yml +- import_tasks: check-containers.yml + - include_tasks: clone.yml when: zun_dev_mode | bool diff --git a/ansible/roles/zun/tasks/upgrade.yml b/ansible/roles/zun/tasks/upgrade.yml index 22af6f5..6ba9f99 100644 --- a/ansible/roles/zun/tasks/upgrade.yml +++ b/ansible/roles/zun/tasks/upgrade.yml @@ -1,6 +1,8 @@ --- - import_tasks: config.yml +- import_tasks: check-containers.yml + - import_tasks: bootstrap_service.yml - name: Flush handlers