commit 0eeff529f489ad831df17494e8682ddfd44771f0 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 (cherry picked from commit 3411b9e4201e619613cef427d228cf00f310a144) diff --git a/ansible/roles/aodh/tasks/config.yml b/ansible/roles/aodh/tasks/config.yml index 05ff9eb..385e30a 100644 --- a/ansible/roles/aodh/tasks/config.yml +++ b/ansible/roles/aodh/tasks/config.yml @@ -89,6 +89,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 e835095..3a93020 100644 --- a/ansible/roles/barbican/tasks/config.yml +++ b/ansible/roles/barbican/tasks/config.yml @@ -133,6 +133,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 f68841f..d33d7c7 100644 --- a/ansible/roles/blazar/tasks/config.yml +++ b/ansible/roles/blazar/tasks/config.yml @@ -75,6 +75,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 3f23b9c..e6a1690 100644 --- a/ansible/roles/ceilometer/tasks/config.yml +++ b/ansible/roles/ceilometer/tasks/config.yml @@ -329,6 +329,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 e5f6fe0..d477a91 100644 --- a/ansible/roles/cinder/tasks/config.yml +++ b/ansible/roles/cinder/tasks/config.yml @@ -129,6 +129,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 ea211b1..d76cbc4 100644 --- a/ansible/roles/cloudkitty/tasks/config.yml +++ b/ansible/roles/cloudkitty/tasks/config.yml @@ -111,6 +111,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 13b2533..ea266ca 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 + # NOTE(mgoddard): Transition support for upgrades from Rocky or Stein which may # be using the SQLAlchemy storage backend. # TODO(mgoddard): Remove in U cycle. 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 ad9581b..1fa4c73 100644 --- a/ansible/roles/common/tasks/config.yml +++ b/ansible/roles/common/tasks/config.yml @@ -387,6 +387,3 @@ become: true when: 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 07f777b..c4424de 100644 --- a/ansible/roles/cyborg/tasks/config.yml +++ b/ansible/roles/cyborg/tasks/config.yml @@ -90,6 +90,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 ff3dedf..aae4883 100644 --- a/ansible/roles/designate/tasks/config.yml +++ b/ansible/roles/designate/tasks/config.yml @@ -145,6 +145,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 1921322..975363d 100644 --- a/ansible/roles/elasticsearch/tasks/config.yml +++ b/ansible/roles/elasticsearch/tasks/config.yml @@ -72,6 +72,3 @@ - inventory_hostname in groups[service['group']] 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 d3c3dd8..9aa31dc 100644 --- a/ansible/roles/elasticsearch/tasks/upgrade.yml +++ b/ansible/roles/elasticsearch/tasks/upgrade.yml @@ -50,5 +50,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 baae942..0acd2e1 100644 --- a/ansible/roles/etcd/tasks/config.yml +++ b/ansible/roles/etcd/tasks/config.yml @@ -24,6 +24,3 @@ with_dict: "{{ etcd_services }}" notify: - Restart {{ item.key }} container - -- 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 e261bb5..ca30836 100644 --- a/ansible/roles/freezer/tasks/config.yml +++ b/ansible/roles/freezer/tasks/config.yml @@ -89,6 +89,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 db009ed..b04fc14 100644 --- a/ansible/roles/glance/tasks/config.yml +++ b/ansible/roles/glance/tasks/config.yml @@ -123,6 +123,3 @@ with_dict: "{{ glance_services }}" notify: - Restart {{ item.key }} 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 d39a6d1..a808fbf 100644 --- a/ansible/roles/glance/tasks/rolling_upgrade.yml +++ b/ansible/roles/glance/tasks/rolling_upgrade.yml @@ -73,6 +73,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 7a442b5..7e5dbdb 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 c9dbd5f..eebf1e1 100644 --- a/ansible/roles/grafana/tasks/config.yml +++ b/ansible/roles/grafana/tasks/config.yml @@ -94,6 +94,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 60aaec0..eed4f9e 100644 --- a/ansible/roles/haproxy/tasks/config.yml +++ b/ansible/roles/haproxy/tasks/config.yml @@ -142,6 +142,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 26c8afd..ea48d25 100644 --- a/ansible/roles/heat/tasks/config.yml +++ b/ansible/roles/heat/tasks/config.yml @@ -75,6 +75,3 @@ with_dict: "{{ heat_services }}" notify: - Restart {{ item.key }} 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 aa1e940..0343897 100644 --- a/ansible/roles/horizon/tasks/config.yml +++ b/ansible/roles/horizon/tasks/config.yml @@ -130,6 +130,3 @@ with_items: "{{ custom_policy }}" notify: - Restart horizon container - -- 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 37d41b9..3492b87 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 cbbf198..3ab6ec8 100644 --- a/ansible/roles/ironic/tasks/config.yml +++ b/ansible/roles/ironic/tasks/config.yml @@ -237,6 +237,3 @@ with_dict: "{{ ironic_services }}" notify: - "Restart {{ item.key }} 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 e13a3bb..27625cc 100644 --- a/ansible/roles/karbor/tasks/config.yml +++ b/ansible/roles/karbor/tasks/config.yml @@ -78,6 +78,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 f0ea714..e4237e2 100644 --- a/ansible/roles/keystone/tasks/config.yml +++ b/ansible/roles/keystone/tasks/config.yml @@ -229,6 +229,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 4b50c11..01b2eca 100644 --- a/ansible/roles/kibana/tasks/config.yml +++ b/ansible/roles/kibana/tasks/config.yml @@ -42,6 +42,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 a421c3b..332e29f 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 + - include_tasks: migrate-kibana-index.yml when: kibana_use_v6 | bool diff --git a/ansible/roles/kuryr/tasks/config.yml b/ansible/roles/kuryr/tasks/config.yml index 0bad4cd..808b759 100644 --- a/ansible/roles/kuryr/tasks/config.yml +++ b/ansible/roles/kuryr/tasks/config.yml @@ -91,6 +91,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 a8c3004..b053e0b 100644 --- a/ansible/roles/magnum/tasks/config.yml +++ b/ansible/roles/magnum/tasks/config.yml @@ -75,6 +75,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 4df1ea0..ece97fd 100644 --- a/ansible/roles/manila/tasks/config.yml +++ b/ansible/roles/manila/tasks/config.yml @@ -113,6 +113,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 94a68a6..889f098 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 ae25863..e608a14 100644 --- a/ansible/roles/mariadb/tasks/config.yml +++ b/ansible/roles/mariadb/tasks/config.yml @@ -96,6 +96,3 @@ with_dict: "{{ mariadb_services }}" notify: - restart mariadb - -- 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 fa88d5d..fcec4f5 100644 --- a/ansible/roles/masakari/tasks/config.yml +++ b/ansible/roles/masakari/tasks/config.yml @@ -125,6 +125,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 1a214e3..6cbf5f7 100644 --- a/ansible/roles/mistral/tasks/config.yml +++ b/ansible/roles/mistral/tasks/config.yml @@ -93,6 +93,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 bf7d34a..99ede6c 100644 --- a/ansible/roles/monasca/tasks/config.yml +++ b/ansible/roles/monasca/tasks/config.yml @@ -412,6 +412,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 63c0a58..c9a9d60 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 9f7d4b0..e6267d5 100644 --- a/ansible/roles/murano/tasks/config.yml +++ b/ansible/roles/murano/tasks/config.yml @@ -74,6 +74,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 1b51f4c..2a8a80d 100644 --- a/ansible/roles/neutron/tasks/config.yml +++ b/ansible/roles/neutron/tasks/config.yml @@ -387,6 +387,3 @@ - "{{ check_extra_ml2_plugins.files }}" notify: - "Restart {{ item.0 }} 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 27fd413..ae2279a 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 8573579..9cebaaf 100644 --- a/ansible/roles/nova-cell/tasks/config.yml +++ b/ansible/roles/nova-cell/tasks/config.yml @@ -171,6 +171,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 db262a3..de6c9f0 100644 --- a/ansible/roles/nova-cell/tasks/deploy.yml +++ b/ansible/roles/nova-cell/tasks/deploy.yml @@ -11,6 +11,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 b990dcb..1d39069 100644 --- a/ansible/roles/nova/tasks/config.yml +++ b/ansible/roles/nova/tasks/config.yml @@ -76,6 +76,3 @@ with_dict: "{{ nova_services }}" notify: - "Restart {{ item.key }} 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 3e6a4da..e69e88f 100644 --- a/ansible/roles/octavia/tasks/config.yml +++ b/ansible/roles/octavia/tasks/config.yml @@ -132,6 +132,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 19c518a..d793a34 100644 --- a/ansible/roles/octavia/tasks/deploy.yml +++ b/ansible/roles/octavia/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/octavia/tasks/upgrade.yml b/ansible/roles/octavia/tasks/upgrade.yml index 3b3eb22..2bae2a3 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/opendaylight/tasks/config.yml b/ansible/roles/opendaylight/tasks/config.yml index 2a68854..196499b 100644 --- a/ansible/roles/opendaylight/tasks/config.yml +++ b/ansible/roles/opendaylight/tasks/config.yml @@ -180,6 +180,3 @@ - "10-rest-connector.xml.j2" notify: - Restart opendaylight container - -- include_tasks: check-containers.yml - when: kolla_action != "config" diff --git a/ansible/roles/opendaylight/tasks/deploy.yml b/ansible/roles/opendaylight/tasks/deploy.yml index 0ac82cc..85bd36c 100644 --- a/ansible/roles/opendaylight/tasks/deploy.yml +++ b/ansible/roles/opendaylight/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/opendaylight/tasks/upgrade.yml b/ansible/roles/opendaylight/tasks/upgrade.yml index 0ac82cc..85bd36c 100644 --- a/ansible/roles/opendaylight/tasks/upgrade.yml +++ b/ansible/roles/opendaylight/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/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 5082ae1..4d2c6ee 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 5082ae1..4d2c6ee 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/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 f2d4fc7..da75026 100644 --- a/ansible/roles/panko/tasks/config.yml +++ b/ansible/roles/panko/tasks/config.yml @@ -89,6 +89,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 83ad5ba..c2f3069 100644 --- a/ansible/roles/placement/tasks/config.yml +++ b/ansible/roles/placement/tasks/config.yml @@ -107,6 +107,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 7febc9b..fe5221e 100644 --- a/ansible/roles/prometheus/tasks/config.yml +++ b/ansible/roles/prometheus/tasks/config.yml @@ -140,6 +140,3 @@ - "{{ role_path }}/templates/prometheus-blackbox-exporter.yml.j2" notify: - Restart prometheus-blackbox-exporter container - -- 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 44dbd35..640e894 100644 --- a/ansible/roles/qinling/tasks/config.yml +++ b/ansible/roles/qinling/tasks/config.yml @@ -94,6 +94,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 25a977b..0c8e483 100644 --- a/ansible/roles/rabbitmq/tasks/config.yml +++ b/ansible/roles/rabbitmq/tasks/config.yml @@ -102,6 +102,3 @@ notify: - Restart rabbitmq container (first node) - Restart rabbitmq container (rest of nodes) - -- 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 136aa69..62b02f4 100644 --- a/ansible/roles/rally/tasks/config.yml +++ b/ansible/roles/rally/tasks/config.yml @@ -72,6 +72,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 4f5af23..f3f7a07 100644 --- a/ansible/roles/sahara/tasks/config.yml +++ b/ansible/roles/sahara/tasks/config.yml @@ -75,6 +75,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 a1acdc0..11d35a4 100644 --- a/ansible/roles/searchlight/tasks/config.yml +++ b/ansible/roles/searchlight/tasks/config.yml @@ -74,6 +74,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 6279ac4..c017144 100644 --- a/ansible/roles/senlin/tasks/config.yml +++ b/ansible/roles/senlin/tasks/config.yml @@ -75,6 +75,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 87c986c..87d2a70 100644 --- a/ansible/roles/skydive/tasks/config.yml +++ b/ansible/roles/skydive/tasks/config.yml @@ -37,6 +37,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 033f7a0..d33a4f0 100644 --- a/ansible/roles/solum/tasks/config.yml +++ b/ansible/roles/solum/tasks/config.yml @@ -44,6 +44,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 9107034..1c0dd94 100644 --- a/ansible/roles/tacker/tasks/config.yml +++ b/ansible/roles/tacker/tasks/config.yml @@ -75,6 +75,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 d64d9c5..d0d975b 100644 --- a/ansible/roles/telegraf/tasks/config.yml +++ b/ansible/roles/telegraf/tasks/config.yml @@ -58,6 +58,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 90c0586..16cdc3f 100644 --- a/ansible/roles/tempest/tasks/config.yml +++ b/ansible/roles/tempest/tasks/config.yml @@ -41,6 +41,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 50027b0..f64cbcc 100644 --- a/ansible/roles/trove/tasks/config.yml +++ b/ansible/roles/trove/tasks/config.yml @@ -96,6 +96,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 0eae412..e2efa87 100644 --- a/ansible/roles/vitrage/tasks/config.yml +++ b/ansible/roles/vitrage/tasks/config.yml @@ -102,6 +102,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 ba269a2..7a1ec9f 100644 --- a/ansible/roles/watcher/tasks/config.yml +++ b/ansible/roles/watcher/tasks/config.yml @@ -72,6 +72,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 5dcf571..0d65d88 100644 --- a/ansible/roles/zun/tasks/config.yml +++ b/ansible/roles/zun/tasks/config.yml @@ -88,6 +88,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