apparently it's three minutes now

[invirt/packages/invirt-web.git] / code / controls.py

diff --git a/code/controls.py b/code/controls.py
index 5512f66..4b9c6a4 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -24,9 +24,9 @@ def uuidToString(u):
 # end stolen code
 
 def remctl(*args, **kwargs):
-    return gen_remctl(config.remote.hostname, *args,
+    return gen_remctl(config.remote.hostname,
                       principal='daemon/'+config.web.hostname,
-                      **kwargs)
+                      *args, **kwargs)
 
 def lvcreate(machine, disk):
     """Create a single disk for a machine"""
@@ -43,6 +43,8 @@ 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)
@@ -173,7 +175,7 @@ def listHost(machine):
 
 def vnctoken(machine):
     """Return a time-stamped VNC token"""
-    out, err = remctl('control', machine.name, 'vnctoken')
+    out, err = remctl('control', machine.name, 'vnctoken', err=True)
     if err:
         return None
     return out.strip()