X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/fd7767152e91a987bf0ee75b3feec3a346fd849e..10a1af41408ed1feed086a361b08e828ce132b58:/client/etc/xen/sipb-database diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database index 4153fc0..0d4d466 100644 --- a/client/etc/xen/sipb-database +++ b/client/etc/xen/sipb-database @@ -1,11 +1,11 @@ # -*- mode: python; -*- -import sipb_xen_database.models as models -from sipb_xen_database import connect +from invirt.database import models, connect +from invirt.config import structs as config import re import tempfile from subprocess import call -connect('postgres://sipb-xen@sipb-xen-dev.mit.edu/sipb_xen') +connect() prefix = "d_" # 'machine_name', and optionally 'cdrom_image', should get passed in @@ -16,9 +16,13 @@ def check(b): 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) -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(name=cdrom_image).one() + check(cdrom is not None) memory = machine.memory maxmem = memory @@ -46,7 +50,7 @@ else: codepath = 'paravm' if 'mirror' in locals(): #Installer - disk.append('phy:/dev/xenvg/d_foobar3_hda,hdb,r') + 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' @@ -55,23 +59,23 @@ if 'mirror' in locals(): #Installer raise RuntimeError('You must have a nic to autoinstall') n = machine.nics[0] extra = 'ro noresume' - extra += ' ip=%s::18.181.0.1:255.255.0.0:%s:eth0:off' % (n.ip, machine.name) + extra += (' ip=%s::%s:%s:%s:eth0:off' + % (n.ip, config.dhcp.gateway, config.dhcp.netmask, machine.name)) extra += ' mirror=%s dist=%s' % (mirror, dist) extra += ' imagesize=%s' % imagesize if 'noinstall' in locals(): extra += ' noinstall' 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:/etc/xenvg/image_' + cdrom.cdrom_id + ',hdc:cdrom,r') 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'