Boot VMs as HVM when there is a boot CD, regardless of machine type

[invirt/packages/invirt-database.git] / client / etc / xen / sipb-database

diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database
index 54c1b74..1928bba 100644 (file)
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -2,6 +2,8 @@
 import sipb_xen_database.models as models
 from sipb_xen_database import connect
 import re
+import tempfile
+from subprocess import call
 
 connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen')
 prefix = "d_"
@@ -16,7 +18,9 @@ def check(b):
 
 machine = models.Machine.get_by(name=machine_name)
 check(machine is not None)
-machine_type = models.Type.get_by(type_id=machine.type_id)
+hvm = machine.type.hvm
+if 'cdrom_image' in locals():
+    hvm = True
 
 memory = machine.memory
 maxmem = memory
@@ -30,7 +34,7 @@ vcpus = machine.cpus
 diskioemu = ""
 viftype = ""
 
-if machine_type.hvm:
+if hvm:
     ioemu = "ioemu:"
     viftype = "type=ioemu, "
 
@@ -39,14 +43,15 @@ if machine_type.hvm:
     vnc = 1
     vncpasswd = 'moocow'
     device_model = '/usr/sbin/qemu-dm-sipb'
+    serial = 'pty'
 else:
-    kernel  = '/boot/vmlinuz-2.6.18-4-xen-amd64'
-    ramdisk = '/boot/initrd.img-2.6.18-4-xen-amd64'
+    kernel  = '/boot/vmlinuz-2.6.18-5-xen-amd64'
+    ramdisk = '/boot/initrd.img-2.6.18-5-xen-amd64'
     builder = 'linux'
 
-pae = machine_type.pae
-acpi = machine_type.acpi
-apic = machine_type.apic
+pae = machine.type.pae
+acpi = machine.type.acpi
+apic = machine.type.apic
 
 vif = []
 
@@ -63,11 +68,25 @@ for d in machine.disks:
     dspec = 'phy:%s,%s%s,w' % (device, diskioemu, d.guest_device_name)
     disk.append(dspec)
 
-if 'cdrom_image' in locals():
+if 'installer' in locals():
+    check(re.match('^[A-Za-z0-9][A-Za-z0-9_.-]*$', installer))
+    tmptree = tempfile.mkdtemp('', 'auto-install.', '/tmp')
+    call(['/usr/sbin/sipb-xen-make-iso', installer, tmptree]
+         + installer_options.split(' '))
+    disk.append('file:'+tmptree+'/install.iso,hdc:cdrom,r')
+    boot = 'd'
+
+elif 'disks' in locals(): # for the copying installer's use
+    disk = disks.split(' ')
+    boot = 'c'
+
+elif 'cdrom_image' in locals():
     check(re.match('^[A-Za-z0-9][A-Za-z0-9_.-]*$', cdrom_image))
     disk.append('file:/srv/images/' + cdrom_image + '.iso,hdc:cdrom,r')
     boot = 'd'
 
+usbdevice = 'tablet'
+
 on_poweroff = 'destroy'
 on_reboot = 'restart'
 on_crash = 'destroy'