Update /etc/xen/sipb-database to work with newer SQLAlchemy and Xen

[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 2d80d07..70eed41 100644 (file)
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -1,5 +1,6 @@
 # -*- mode: python; -*-
 from invirt.database import models, connect
 # -*- mode: python; -*-
 from invirt.database import models, connect

+from invirt.config import structs as config

 import re
 import tempfile
 from subprocess import call
 import re
 import tempfile
 from subprocess import call

@@ -15,9 +16,9 @@ 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 = models.Type.query().filter_by(type_id=machine.type_id).one()

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

@@ -54,7 +55,8 @@ if 'mirror' in locals(): #Installer
         raise RuntimeError('You must have a nic to autoinstall')
     n = machine.nics[0]
     extra = 'ro noresume'
         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():
     extra += ' mirror=%s dist=%s' % (mirror, dist)
     extra += ' imagesize=%s' % imagesize
     if 'noinstall' in locals():

@@ -70,7 +72,7 @@ elif 'cdrom_image' in locals():
 if codepath == 'hvm':
     ioemu = "ioemu:"
     viftype = "type=ioemu, "
 if codepath == 'hvm':
     ioemu = "ioemu:"
     viftype = "type=ioemu, "

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

     builder = 'hvm'
     vnc = 1
     vncpasswd = 'moocow'
     builder = 'hvm'
     vnc = 1
     vncpasswd = 'moocow'