Merge pull request openstack-charmers#91 from gnuoy/issue/88

Ensure units are idle before prepare_series_upgrade
exsdev0 · Oct 11, 2019 · bf483db · bf483db
2 parents 2b3c42f + 9f73b21
commit bf483db
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/zaza/openstack/utilities/generic.py b/zaza/openstack/utilities/generic.py
@@ -368,6 +368,7 @@ def series_upgrade(unit_name, machine_num,
     application = unit_name.split('/')[0]
     set_dpkg_non_interactive_on_unit(unit_name)
     dist_upgrade(unit_name)
+    model.block_until_all_units_idle()
     logging.info("Prepare series upgrade on {}".format(machine_num))
     model.prepare_series_upgrade(machine_num, to_series=to_series)
     logging.info("Waiting for workload status 'blocked' on {}"