When creating a new VM, create the disks in the try/except block so

that everything gets rolled back if that fails.

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

diff --git a/code/controls.py b/code/controls.py
index 911c41a..e32b1c2 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -105,11 +105,11 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
         session.save_or_update(nic)
         session.save_or_update(disk)
         cache_acls.refreshMachine(machine)
         session.save_or_update(nic)
         session.save_or_update(disk)
         cache_acls.refreshMachine(machine)

+        makeDisks(machine)

         session.commit()
     except:
         session.rollback()
         raise
         session.commit()
     except:
         session.rollback()
         raise

-    makeDisks(machine)

     try:
         if autoinstall:
             lvinstall(machine, autoinstall)
     try:
         if autoinstall:
             lvinstall(machine, autoinstall)