From 142d1f1f1c69a30fdc77deb18d560d1fb9b7223c Mon Sep 17 00:00:00 2001 From: Ondra Machacek Date: Fri, 28 Sep 2018 10:59:59 +0200 Subject: [PATCH] ovirt_host: Fix fail condititon of upgrade (#46104) Signed-off-by: Ondra Machacek --- lib/ansible/modules/cloud/ovirt/ovirt_host.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_host.py b/lib/ansible/modules/cloud/ovirt/ovirt_host.py index 4d17f9c191..685efe3daf 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_host.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_host.py @@ -515,7 +515,16 @@ def main(): action_condition=lambda h: h.update_available, wait_condition=lambda h: h.status == result_state, post_action=lambda h: time.sleep(module.params['poll_interval']), - fail_condition=hosts_module.failed_state_after_reinstall, + fail_condition=lambda h: hosts_module.failed_state_after_reinstall(h) or ( + len([ + event + for event in events_service.list( + from_=int(last_event.id), + # Fail upgrade if migration fails. + search='type=65 or type=140', + ) + ]) > 0 + ), reboot=module.params['reboot_after_upgrade'], ) elif state == 'iscsidiscover':