port sipb-xen-database to sqlalchemy-0.4

[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 4153fc0..d6c8b3c 100644 (file)
--- 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
@@ -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():