arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not wait for idleness after pre-series-upgrade

Browse Source 
The pre-series-upgrade hook stops the juju agent. This can cause the
juju wait for idleness to wait forever. Wait for the expected workload
status instead.
This commit is contained in:
David Ames
2018-09-10 15:20:04 -07:00
parent c4182197d4
commit e893cc4b40
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
zaza/utilities/generic.py
View File

@@ -270,15 +270,12 @@ def series_upgrade(unit_name, machine_num,
application = unit_name.split('/')[0]
logging.info("Prepare series upgrade on {}".format(machine_num))
juju_utils.prepare_series_upgrade(machine_num, to_series=to_series)
logging.info("Watiing for model idleness")
model.block_until_all_units_idle()
logging.info("Watiing for workload status 'unknown' on {}"
.format(unit_name))
model.block_until_unit_wl_status(unit_name, "unknown")
wrap_do_release_upgrade(unit_name, from_series=from_series,
to_series=to_series, files=files,
workaround_script=workaround_script)
model.block_until_all_units_idle()
logging.info("Reboot {}".format(unit_name))
reboot(unit_name)
logging.info("Watiing for workload status 'blocked' on {}"