Fixed validation of administrator field.

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

diff --git a/code/controls.py b/code/controls.py
index faa27a7..6346002 100644 (file)
--- a/code/controls.py
+++ b/code/controls.py
@@ -53,7 +53,7 @@ def lvinstall(machine, autoinstall):
                          'arch=%s' % autoinstall.arch,
                          'imagesize=%s' % imagesize]
     if autoinstall.preseed:
                          'arch=%s' % autoinstall.arch,
                          'imagesize=%s' % imagesize]
     if autoinstall.preseed:

-        installer_options += ['preseed=http://'+config.web.hostname+'/static/preseed/'+autoinstall.distribution+'/'+autoinstall.arch+'.preseed']
+        installer_options += ['preseed=http://'+config.web.hostname+'/static/preseed/'+autoinstall.autoinstall_id+'.preseed']

 
     remctl('control', machine.name, 'install',
            *installer_options)
 
     remctl('control', machine.name, 'install',
            *installer_options)

@@ -116,7 +116,7 @@ def createVm(username, state, owner, contact, name, description, memory, disksiz
         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!  "
         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)
+                            "Contact %s." % config.contact)

         nic.machine = machine
         nic.hostname = name
         session.save_or_update(nic)
         nic.machine = machine
         nic.hostname = name
         session.save_or_update(nic)