diff --git a/ansible/roles/aodh/tasks/config.yml b/ansible/roles/aodh/tasks/config.yml index 3162e6a5b5..0f5d0c1e7e 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 df86282bbd..92e7fce2af 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 22af6f5634..6ba9f99799 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 f29a1ad3b0..4d48f4bd06 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 c16604aaab..ae69a9e0ce 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 22af6f5634..6ba9f99799 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 5355874d21..24c9e0c536 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 a2b0cf2f25..27c21e9dfb 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 22af6f5634..6ba9f99799 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 128a0c6700..55623f0efd 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 e7436918b4..59e691146e 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 22af6f5634..6ba9f99799 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 b28c4cfa03..73d80b03ae 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 8f7f4dd832..49edff81e3 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 9cf7215142..c389872876 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 07aa8b853d..f123f639c1 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 cf9c0c1bfc..17bbdae0cf 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 a381073f2d..967b8cab36 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 5ecbdb8127..821951b00a 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 22af6f5634..6ba9f99799 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 7c69ce1ca4..6b82fca9fe 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 8f7f4dd832..49edff81e3 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 8f7f4dd832..49edff81e3 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 4d40b8d75a..1d98c74ef5 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 6e56d09356..d0b36cb78b 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 8f7f4dd832..49edff81e3 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 4bfa07d27e..0c4fa0df6d 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 19c518a48a..d793a349da 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 22af6f5634..6ba9f99799 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 e2e6914fae..92a2d47fcf 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 b6ec40d768..b4bd4d3389 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 2ccfafe0f6..b87dcfb5c3 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 079327b05e..630b15e55d 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 982db9c17b..514002b273 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 d8fb94244f..a7b0484ba5 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 ba228357d2..e3fc555405 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 8f7f4dd832..49edff81e3 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 8f7f4dd832..49edff81e3 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 ae7620ef02..b6f42441f9 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 e33a163bce..107355641f 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 22af6f5634..6ba9f99799 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 43a9e1cdbf..702501d7a9 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 9150e39408..3b0a139232 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 22af6f5634..6ba9f99799 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 59736f26a8..4fbf1a4656 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 f97f41ccaf..98448789f3 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 19c518a48a..d793a349da 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 22af6f5634..6ba9f99799 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 f9f4f7430b..0dba359bd7 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 41c76648d1..32431aa455 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 ae47e4b7a3..e9c7a674c2 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 1ca42fb9f1..5c82dbdb67 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 efc8213396..8532ea3396 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 b2fbdf9398..37e6539154 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 1adc6a8b21..9f2a8d8c21 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 2089d66dda..248811d3d6 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 088c08bec4..1f5e8ff45f 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 3ae46de09a..2415269574 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 9542c17add..b8b6995811 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 3311b7aa9f..841e7aeb7a 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 8f7f4dd832..49edff81e3 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 8f7f4dd832..49edff81e3 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 45410533b5..fc51e4a2b5 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 1d0a6395ed..bf32d69f35 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 35f7abe84d..ccfc6f30fe 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 08f2f3a53e..ad39fba27a 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 34856259d1..1c9da9dfc0 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 982db9c17b..514002b273 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 6323eb46b2..5338a89e98 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 8f7f4dd832..49edff81e3 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 8f7f4dd832..49edff81e3 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 cde7f68d83..81125eb3a6 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 19c518a48a..d793a349da 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 22af6f5634..6ba9f99799 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 f4532c6bbc..06ecea3a7c 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 7b389b4b6a..656e44e312 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 ca1d509e1d..8f98db175f 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 82b89ced66..6623f356cb 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 8f7f4dd832..49edff81e3 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 710d7967ce..175913a64b 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 eab990e331..c05971366a 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 65f7c8e2a1..d253fcbb82 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 8f7f4dd832..49edff81e3 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 b26234daef..c299631058 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 8b4eba876f..b6c9648280 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 22af6f5634..6ba9f99799 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 26c55bf2cc..bf2929c804 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 ea83bb2049..7f092432bf 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 22af6f5634..6ba9f99799 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 b305f90e35..5e6238148d 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 b9acd6337f..9e2d1d8db0 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 043b0b43e7..4e664e3803 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 90cb893c32..e8edec1c09 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 22af6f5634..6ba9f99799 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 8aeeea38bb..20edb14162 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 abd540e4d4..651076c4c5 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 abd540e4d4..651076c4c5 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 e7f92bd5dd..3f30bb675a 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 05886fccf9..e0c2b34837 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 22af6f5634..6ba9f99799 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 6e3e409683..ed1f6919bd 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 b3912ad97c..49b806555a 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 32f755cdbd..20eeaaf56d 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 e5f70d4e46..666840565d 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 982db9c17b..514002b273 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 982db9c17b..514002b273 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 f46e8ba87d..8f26465784 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 7c092c278d..a039004dd7 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 fa9fd68267..7d9c287b04 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 189e033ed1..115402242f 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 70ec741597..49d79e20d8 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 7d3ba6cda7..21f682c04b 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 f3512c25d3..cada9e1c30 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 f5ca017239..8e4a2c29b7 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 20a9d8ade4..795739f29b 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 c53a845c0e..b1637ad8a2 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 bfd41be697..dd75b5af70 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 aa0718beb8..9155c24cea 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 a8d45b4f2a..1a2c675437 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 3b35613dc6..b45adf4c94 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 da8bbcc18d..c165f26ccf 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 22af6f5634..6ba9f99799 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 f9cf6bac71..4089234fe5 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 2c80a0fad0..5db44393cb 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 2c80a0fad0..5db44393cb 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 f8e8daf575..4731d581d0 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 6e56d09356..d0b36cb78b 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 6e56d09356..d0b36cb78b 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 ff991f8e3a..8d6adc542b 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 56ef2c0a1f..682ed3e300 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 f78ece80de..97bcabf02b 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 19c518a48a..d793a349da 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 22af6f5634..6ba9f99799 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 d29f8cf051..a17610767a 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 035a67eceb..504031a3c2 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 06be0b37d9..7e98e01270 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 eb54e47def..2140f351fe 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 6e56d09356..d0b36cb78b 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 8f7f4dd832..49edff81e3 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 178ee2d4af..ff426f1204 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 5e5cf178aa..5b19eeab6a 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 8f7f4dd832..49edff81e3 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 ba23384ccb..625f9aa68a 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 4316e672f5..de9d81428f 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 22af6f5634..6ba9f99799 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 9e9f4f2213..df8c0cdb5f 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 6e56d09356..d0b36cb78b 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 ba7856ae70..6afca0569f 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 d53314234d..31338a4cb5 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 6e56d09356..d0b36cb78b 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 22af6f5634..6ba9f99799 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 6c8a9d44fd..e6cfc003d6 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 8f7f4dd832..49edff81e3 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 8f7f4dd832..49edff81e3 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 578a9ade07..bed6647e8b 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 c859769eec..968cdfe078 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 22af6f5634..6ba9f99799 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 374218c1a6..5b661eb6d7 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 19c518a48a..d793a349da 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 22af6f5634..6ba9f99799 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 793ee6f2e4..34e0ea3389 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 9abd1cedda..3b9ca1ece1 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 22af6f5634..6ba9f99799 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 46b85db06a..c58404f8b2 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 8f7f4dd832..49edff81e3 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 8f7f4dd832..49edff81e3 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 043abc1f99..9b3ff8072b 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 e888713dba..3d2bb2f61d 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 22af6f5634..6ba9f99799 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 516cf1a233..39301da7ad 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 8f7f4dd832..49edff81e3 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 cb69ef7cbc..ecdf54db28 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 743fb8ca98..e1b6b66903 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 0b64243aa8..4a53114758 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 61d35ede2a..a0a947f2ee 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 8f7f4dd832..49edff81e3 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 8f7f4dd832..49edff81e3 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 a9ce4d9936..eee199336f 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 8f7f4dd832..49edff81e3 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 8f7f4dd832..49edff81e3 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 ddbacbaa00..be29058e0b 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 1a845e832a..e0323b3778 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 22af6f5634..6ba9f99799 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 a20e3db5c4..60d68e4f46 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 91e701bbe3..28649bcdcb 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 22af6f5634..6ba9f99799 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 66009ab41e..b0c1ac7d77 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 8f7f4dd832..49edff81e3 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 8f7f4dd832..49edff81e3 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 6ff9f84802..a634d03db1 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 650560ac26..f7c2f450a2 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 22af6f5634..6ba9f99799 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 7e97996a7e..abbf45ad0e 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 8f7f4dd832..49edff81e3 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 8f7f4dd832..49edff81e3 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 cd149c4981..f0c34a0074 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 85e2a8b109..7e14eb039f 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 22af6f5634..6ba9f99799 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