X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-database.git/blobdiff_plain/fd7767152e91a987bf0ee75b3feec3a346fd849e..7f28be2669ae1670b11e1025ede6a0aa2413886a:/client/etc/xen/sipb-database diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database index 4153fc0..70eed41 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,9 @@ 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 = models.Type.query().filter_by(type_id=machine.type_id).one() memory = machine.memory maxmem = memory @@ -55,7 +55,8 @@ 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.network.gateway, config.network.netmask, machine.name)) extra += ' mirror=%s dist=%s' % (mirror, dist) extra += ' imagesize=%s' % imagesize if 'noinstall' in locals(): @@ -71,7 +72,7 @@ elif 'cdrom_image' in locals(): if codepath == 'hvm': ioemu = "ioemu:" viftype = "type=ioemu, " - kernel = 'hvmloader' + kernel = '/usr/lib/xen/boot/hvmloader' builder = 'hvm' vnc = 1 vncpasswd = 'moocow'