projects
/
invirt/packages/invirt-web.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow global imports to be specified for Mako templates
[invirt/packages/invirt-web.git]
/
code
/
controls.py
diff --git
a/code/controls.py
b/code/controls.py
index
d152627
..
e32b1c2
100644
(file)
--- a/
code/controls.py
+++ b/
code/controls.py
@@
-43,8
+43,6
@@
def getswap(disksize, memsize):
return int(min(disksize / 4, memsize * 1.5))
def lvinstall(machine, autoinstall):
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)
disksize = machine.disks[0].size
memsize = machine.memory
swapsize = getswap(disksize, memsize)
@@
-98,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)
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)
if not nic: #No IPs left!
raise CodeError("No IP addresses left! "
"Contact %s." % config.web.errormail)
@@
-107,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)
session.save_or_update(nic)
session.save_or_update(disk)
cache_acls.refreshMachine(machine)
+ makeDisks(machine)
session.commit()
except:
session.rollback()
raise
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():
return machine
def getList():