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

svn path=/trunk/packages/sipb-xen-database/; revision=842

diff --git a/client/etc/xen/sipb-database b/client/etc/xen/sipb-database
index 2d80d07..d6c8b3c 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

@@ -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():

diff --git a/config.todo b/config.todo
deleted file mode 100644 (file)
index 2af7206..0000000
--- a/config.todo
+++ /dev/null
@@ -1 +0,0 @@
-client/etc/xen/sipb-database: gateway, netmask

diff --git a/debian/changelog b/debian/changelog
index b3dd84b..4598e59 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sipb-xen-database (10.17) unstable; urgency=low
+
+  * pull IP gateway, network from config
+  * configurabilization complete!
+
+ -- Greg Price <price@mit.edu>  Sun,  3 Aug 2008 01:16:53 -0400
+

 sipb-xen-database (10.16) unstable; urgency=low
 
   in sipb-xen-database-tables:
 sipb-xen-database (10.16) unstable; urgency=low
 
   in sipb-xen-database-tables: