Remove bridge specification from sipb-database

[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 d6c8b3c..c2e4c2e 100644 (file)
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -16,9 +16,13 @@ def check(b):
         import sys
         sys.exit(1)
 
         import sys
         sys.exit(1)
 

-machine = models.Machine.get_by(name=machine_name)
+machine = models.Machine.query().filter_by(name=machine_name).one()

 check(machine is not None)
 check(machine is not None)

-machine_type = models.Type.get_by(type_id=machine.type_id)
+machine_type = machine.type
+cdrom = None
+if 'cdrom_image' in locals():
+    cdrom = models.CDROM.query().filter_by(cdrom_id=cdrom_image).one()
+    check(cdrom is not None)

 
 memory = machine.memory
 maxmem = memory
 
 memory = machine.memory
 maxmem = memory

@@ -45,8 +49,8 @@ if machine_type.hvm:
 else:
     codepath = 'paravm'
 
 else:
     codepath = 'paravm'
 

-if 'mirror' in locals(): #Installer
-    disk.append('phy:/dev/xenvg/d_foobar3_hda,hdb,r')
+if 'installer_options' in locals(): #Installer
+    disk.append('phy:/dev/xenvg/s_install_hda,hdb,r')

 
     kernel = '/boot/vmlinuz-2.6.24-19-xen' #From hardy
     ramdisk = '/boot/initrd.img-2.6.24-19-xen'
 
     kernel = '/boot/vmlinuz-2.6.24-19-xen' #From hardy
     ramdisk = '/boot/initrd.img-2.6.24-19-xen'

@@ -56,35 +60,31 @@ if 'mirror' in locals(): #Installer
     n = machine.nics[0]
     extra = 'ro noresume'
     extra += (' ip=%s::%s:%s:%s:eth0:off'
     n = machine.nics[0]
     extra = 'ro noresume'
     extra += (' ip=%s::%s:%s:%s:eth0:off'

-         % (n.ip, config.network.gateway, config.network.netmask, machine.name))
-    extra += ' mirror=%s dist=%s' % (mirror, dist)
-    extra += ' imagesize=%s' % imagesize
-    if 'noinstall' in locals():
-        extra += ' noinstall'
+         % (n.ip, config.dhcp.gateway, config.dhcp.netmask, machine.name))
+    extra += ' %s' % installer_options

     root = '/dev/hdb1'
     codepath = None
     root = '/dev/hdb1'
     codepath = None

-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')
+elif cdrom is not None:
+    disk.append('phy:/dev/xenvg/image_' + cdrom.cdrom_id + ',hdc:cdrom,r')

     boot = 'd'
     codepath = 'hvm'
 
 if codepath == 'hvm':
     ioemu = "ioemu:"
     viftype = "type=ioemu, "
     boot = 'd'
     codepath = 'hvm'
 
 if codepath == 'hvm':
     ioemu = "ioemu:"
     viftype = "type=ioemu, "

-    kernel = 'hvmloader'
+    kernel = '/usr/lib/xen/boot/hvmloader'

     builder = 'hvm'
     vnc = 1
     vncpasswd = 'moocow'
     device_model = '/usr/sbin/qemu-dm-sipb'
     serial = "pty"
 elif codepath == 'paravm':
     builder = 'hvm'
     vnc = 1
     vncpasswd = 'moocow'
     device_model = '/usr/sbin/qemu-dm-sipb'
     serial = "pty"
 elif codepath == 'paravm':

-    bootloader = '/usr/lib/xen-default/bin/pygrub'
+    bootloader = '/usr/bin/pygrub'

 
 
 for n in machine.nics:
     check(re.match('^[0-9a-fA-F:]+$', n.mac_addr) and re.match('^[0-9.]*$', n.ip))
 
 
 for n in machine.nics:
     check(re.match('^[0-9a-fA-F:]+$', n.mac_addr) and re.match('^[0-9.]*$', n.ip))

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

     vif.append(d)
 
 for d in machine.disks:
     vif.append(d)
 
 for d in machine.disks: