Revert punting the "moocow" password in invirt-web and
[invirt/packages/invirt-web.git] / code / controls.py
index 5512f66..e32b1c2 100644 (file)
@@ -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"""
@@ -51,6 +51,7 @@ def lvinstall(machine, autoinstall):
     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):
@@ -87,7 +88,7 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
         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
@@ -95,7 +96,7 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
         session.save_or_update(machine)
         disk = Disk(machine=machine,
                     guest_device_name='hda', size=disksize)
-        nic = NIC.query().filter_by(machine_id=None).first()
+        nic = NIC.query().filter_by(machine_id=None).filter_by(reusable=True).first()
         if not nic: #No IPs left!
             raise CodeError("No IP addresses left!  "
                             "Contact %s." % config.web.errormail)
@@ -104,16 +105,20 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
         session.save_or_update(nic)
         session.save_or_update(disk)
         cache_acls.refreshMachine(machine)
+        makeDisks(machine)
         session.commit()
     except:
         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():
@@ -173,7 +178,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()