finish configuration of sipb-xen-database; add network config to master.yaml

[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 6753254..d6c8b3c 100644 (file)
--- a/client/etc/xen/sipb-database
+++ b/client/etc/xen/sipb-database
@@ -1,11 +1,11 @@
 # -*- mode: python; -*-
 # -*- 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
 
 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
 prefix = "d_"
 
 # 'machine_name', and optionally 'cdrom_image', should get passed in

@@ -46,7 +46,7 @@ else:
     codepath = 'paravm'
 
 if 'mirror' in locals(): #Installer
     codepath = 'paravm'
 
 if 'mirror' in locals(): #Installer

-    disk.append('phy:/dev/xenvg/d_foobar4_hda,hdb,r')
+    disk.append('phy:/dev/xenvg/d_foobar3_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'

@@ -55,10 +55,12 @@ 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
     extra += ' mirror=%s dist=%s' % (mirror, dist)
     extra += ' imagesize=%s' % imagesize

-    #extra += ' noinstall'
+    if 'noinstall' in locals():
+        extra += ' noinstall'

     root = '/dev/hdb1'
     codepath = None
 elif 'cdrom_image' in locals():
     root = '/dev/hdb1'
     codepath = None
 elif 'cdrom_image' in locals():