Correct the incomplete fix from r1155

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

diff --git a/code/controls.py b/code/controls.py
index d895364..7b4558e 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -24,9 +24,9 @@ def uuidToString(u):
 # end stolen code
 
 def remctl(*args, **kwargs):
 # 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,
                       principal='daemon/'+config.web.hostname,

-                      **kwargs)
+                      *args, **kwargs)

 
 def lvcreate(machine, disk):
     """Create a single disk for a machine"""
 
 def lvcreate(machine, disk):
     """Create a single disk for a machine"""

@@ -51,6 +51,7 @@ def lvinstall(machine, autoinstall):
     remctl('control', machine.name, 'install', 
            'dist=%s' % autoinstall.distribution,
            'mirror=%s' % autoinstall.mirror,
     remctl('control', machine.name, 'install', 
            'dist=%s' % autoinstall.distribution,
            'mirror=%s' % autoinstall.mirror,

+           'arch=%s' % autoinstall.arch,

            'imagesize=%s' % imagesize)
 
 def lvcopy(machine_orig_name, machine, rootpw):
            'imagesize=%s' % imagesize)
 
 def lvcopy(machine_orig_name, machine, rootpw):

@@ -87,7 +88,7 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
         machine.description = description
         machine.memory = memory
         machine.owner = owner
         machine.description = description
         machine.memory = memory
         machine.owner = owner

-        machine.administrator = owner
+        machine.administrator = None

         machine.contact = contact
         machine.uuid = uuidToString(randomUUID())
         machine.boot_off_cd = True
         machine.contact = contact
         machine.uuid = uuidToString(randomUUID())
         machine.boot_off_cd = True

@@ -171,6 +172,13 @@ def listHost(machine):
         return None
     return out.strip()
 
         return None
     return out.strip()
 

+def vnctoken(machine):
+    """Return a time-stamped VNC token"""
+    out, err = remctl('control', machine.name, 'vnctoken', err=True)
+    if err:
+        return None
+    return out.strip()
+

 def deleteVM(machine):
     """Delete a VM."""
     remctl('control', machine.name, 'destroy', err=True)
 def deleteVM(machine):
     """Delete a VM."""
     remctl('control', machine.name, 'destroy', err=True)