mirror of
https://github.com/ComputerScienceHouse/proxstar.git
synced 2025-03-09 15:40:09 +00:00
Increase template delay and don't fail deleting VM if starrs doesn't have a record
This commit is contained in:
parent
1ee7198363
commit
dba7d0341c
1 changed files with 7 additions and 2 deletions
|
@ -95,7 +95,12 @@ def delete_vm_task(vmid):
|
||||||
starrs = connect_starrs()
|
starrs = connect_starrs()
|
||||||
vm = VM(vmid)
|
vm = VM(vmid)
|
||||||
# do this before deleting the VM since it is hard to reconcile later
|
# do this before deleting the VM since it is hard to reconcile later
|
||||||
|
retry = 0
|
||||||
|
while retry < 3:
|
||||||
|
try:
|
||||||
delete_starrs(starrs, vm.name)
|
delete_starrs(starrs, vm.name)
|
||||||
|
except:
|
||||||
|
continue
|
||||||
if vm.status != 'stopped':
|
if vm.status != 'stopped':
|
||||||
vm.stop()
|
vm.stop()
|
||||||
retry = 0
|
retry = 0
|
||||||
|
@ -167,7 +172,7 @@ def setup_template_task(template_id, name, user, ssh_key, cores, memory):
|
||||||
while retry < timeout:
|
while retry < timeout:
|
||||||
if not VM(vmid).is_provisioned():
|
if not VM(vmid).is_provisioned():
|
||||||
retry += 1
|
retry += 1
|
||||||
time.sleep(3)
|
time.sleep(6)
|
||||||
continue
|
continue
|
||||||
break
|
break
|
||||||
if retry == timeout:
|
if retry == timeout:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue