Move the autoinstaller disabling code to a more useful location

(i.e. so that it'll throw the exception before it creates the VM)

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

diff --git a/code/controls.py b/code/controls.py
index d152627..7b4558e 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -43,8 +43,6 @@ def getswap(disksize, memsize):
     return int(min(disksize / 4, memsize * 1.5))
 
 def lvinstall(machine, autoinstall):
-    #raise InvalidInput('autoinstall', 'install',
-    #                   "The autoinstaller has been temporarily disabled")
     disksize = machine.disks[0].size
     memsize = machine.memory
     swapsize = getswap(disksize, memsize)

diff --git a/code/validation.py b/code/validation.py
index ecd8b9f..513b431 100644 (file)
--- a/code/validation.py
+++ b/code/validation.py
@@ -66,6 +66,8 @@ class Validate:
                 raise CodeError("Invalid cdrom type '%s'" % cdrom)
             self.cdrom = cdrom
         if autoinstall is not None:
+            #raise InvalidInput('autoinstall', 'install',
+            #                   "The autoinstaller has been temporarily disabled")
             self.autoinstall = Autoinstall.query().get(autoinstall)