parallelvirtualcluster
/
pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 111 Wiki Activity

Ensure inner cleanup and end message response

This commit is contained in:
Joshua Boniface 2022-10-05 22:36:42 -04:00
parent 8aaac33056
commit fe17d28385
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
api-daemon/pvcapid/vmbuilder.py
View File

@ -688,6 +688,8 @@ def create_vm(
with chroot(temp_dir): with chroot(temp_dir):
vm_builder.prepare() vm_builder.prepare()
except Exception as e: except Exception as e:
with chroot(temp_dir):
vm_builder.cleanup()
general_cleanup() general_cleanup()
raise ProvisioningError(f"Error in script prepare() step: {e}") raise ProvisioningError(f"Error in script prepare() step: {e}")
@ -709,6 +711,8 @@ def create_vm(
with chroot(temp_dir): with chroot(temp_dir):
vm_builder.install() vm_builder.install()
except Exception as e: except Exception as e:
with chroot(temp_dir):
vm_builder.cleanup()
general_cleanup() general_cleanup()
raise ProvisioningError(f"Error in script install() step: {e}") raise ProvisioningError(f"Error in script install() step: {e}")
@ -764,3 +768,9 @@ def create_vm(
with open_zk(config) as zkhandler: with open_zk(config) as zkhandler:
success, message = pvc_vm.start_vm(zkhandler, vm_name) success, message = pvc_vm.start_vm(zkhandler, vm_name)
print(message) print(message)
end_message = f'VM "{vm_name}" with profile "{vm_profile}" has been provisioned and started successfully'
else:
end_message = f'VM "{vm_name}" with profile "{vm_profile}" has been provisioned successfully'
return {"status": end_message, "current": 10, "total": 10}