saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Incorporate review comments.

Browse source
This commit is contained in:
Ric Klaren 2017-10-23 09:26:37 -05:00
parent 3a10b6aef1
commit 7917d1e61e
No known key found for this signature in database
GPG key ID: 17E816B8D29509F3
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
salt/cloud/clouds/libvirt.py
View file

@ -463,12 +463,27 @@ def create(vm_):
return ret
except Exception as e: # pylint: disable=broad-except
do_cleanup(cleanup)
# throw the root cause after cleanup
raise e
def do_cleanup(cleanup):
# Try to clean up in as many cases as possible. Libvirt behavior changed
# somewhat over time, so try to be robust.
'''
Clean up clone domain leftovers as much as possible.
Extra robust clean up in order to deal with some small changes in libvirt
behavior over time. Passed in volumes and domains are deleted, any errors
are ignored. Used when cloning/provisioning a domain fails.
:param cleanup: list containing dictonaries with two keys: 'what' and 'item'.
If 'what' is domain the 'item' is a libvirt domain object.
If 'what' is volume then the item is a libvirt volume object.
Returns:
none
.. versionadded: 2017.7.3
'''
log.info('Cleaning up after exception')
for leftover in cleanup:
what = leftover['what']