If the autoinstall or initial boot of a VM fails, destroy the VM

immediately.

svn path=/trunk/packages/invirt-web/; revision=2020

diff --git a/code/controls.py b/code/controls.py
index 7b4558e..4cd0e9c 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -110,11 +110,15 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
         session.rollback()
         raise
     makeDisks(machine)
         session.rollback()
         raise
     makeDisks(machine)

-    if autoinstall:
-        lvinstall(machine, autoinstall)
-    else:
-        # tell it to boot with cdrom
-        bootMachine(machine, cdrom)
+    try:
+        if autoinstall:
+            lvinstall(machine, autoinstall)
+        else:
+            # tell it to boot with cdrom
+            bootMachine(machine, cdrom)
+    except CodeError, e:
+        deleteVM(machine)
+        raise

     return machine
 
 def getList():
     return machine
 
 def getList():