X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/ac38214011c2208fb3766cac49066ebbda374493..refs/heads/iannucci:/code/controls.py?ds=sidebyside diff --git a/code/controls.py b/code/controls.py index faa27a7..6346002 100644 --- 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: - 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) @@ -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! " - "Contact %s." % config.web.errormail) + "Contact %s." % config.contact) nic.machine = machine nic.hostname = name session.save_or_update(nic)