Stuff that works is happy.

[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 daccd93..0c30eff 100644 (file)
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -1,3 +1,4 @@
+# -*- mode: python; -*-

 import sipb_xen_database.models as models
 from sipb_xen_database import connect
 
 import sipb_xen_database.models as models
 from sipb_xen_database import connect
 

@@ -19,12 +20,13 @@ viftype = ""
 
 if machine_type.hvm:
     ioemu = "ioemu:"
 
 if machine_type.hvm:
     ioemu = "ioemu:"

-    viftype = "type=ioemu"
+    viftype = "type=ioemu, "

 
     kernel = 'hvmloader'
     builder = 'hvm'
     vnc = 1
 
     kernel = 'hvmloader'
     builder = 'hvm'
     vnc = 1

-    device_model = 'qemu-dm'
+    vncpasswd = 'moocow'
+    device_model = '/usr/sbin/qemu-dm-sipb'

 else:
     kernel  = '/boot/vmlinuz-2.6.18-4-xen-amd64'
     ramdisk = '/boot/initrd.img-2.6.18-4-xen-amd64'
 else:
     kernel  = '/boot/vmlinuz-2.6.18-4-xen-amd64'
     ramdisk = '/boot/initrd.img-2.6.18-4-xen-amd64'

@@ -37,13 +39,13 @@ apic = machine_type.apic
 vif = []
 
 for n in machine.nics:
 vif = []
 
 for n in machine.nics:

-    d = '%s, mac=%s, ip=%s, bridge=xenbr0, script=vif-sipbroute' % (viftype, n.mac_addr, n.ip)
+    d = '%smac=%s, ip=%s, bridge=xenbr0, script=vif-sipbroute' % (viftype, n.mac_addr, n.ip)

     vif.append(d)
 
 disk = []
 
 for d in machine.disks:
     vif.append(d)
 
 disk = []
 
 for d in machine.disks:

-    device = 'xenvg/' + machine.name + '_' + d.guest_device_name
+    device = '/dev/xenvg/' + machine.name + '_' + d.guest_device_name

     dspec = 'phy:%s,%s%s,w' % (device, diskioemu, d.guest_device_name)
     disk.append(dspec)
 
     dspec = 'phy:%s,%s%s,w' % (device, diskioemu, d.guest_device_name)
     disk.append(dspec)