valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #24136 from rallytime/bp-24104

Browse Source 
Backport #24104 to 2015.5
This commit is contained in:
Justin Findlay 2015-05-26 09:58:47 -06:00
commit 89cdf976e1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/cloud/clouds/proxmox.py
View File

@ -846,7 +846,8 @@ def destroy(name, call=None):
vmobj = _getVmByName(name)
if vmobj is not None:
# stop the vm
stop(name, vmobj['vmid'], 'action')
if get_vm_status(vmid=vmobj['vmid'])['status'] != 'stopped':
stop(name, vmobj['vmid'], 'action')
# wait until stopped
if not wait_for_state(vmobj['vmid'], 'stopped'):