Changeset 842 for trunk/packages

Timestamp:

Aug 3, 2008, 1:19:41 AM (16 years ago)

Author:

price

Message:

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

Location:

trunk/packages

Files:

• sipb-xen-database/client/etc/xen/sipb-database (modified) (2 diffs)
• sipb-xen-database/config.todo (deleted)
• sipb-xen-database/debian/changelog (modified) (1 diff)
• xvm-devconfig/debian/changelog (modified) (1 diff)
• xvm-devconfig/files/etc/invirt/master.yaml (modified) (1 diff)

trunk/packages/sipb-xen-database/client/etc/xen/sipb-database

@@ -1 +1 @@
 # -*- mode: python; -*-
 from invirt.database import models, connect
+from invirt.config import structs as config
 import re
 import tempfile
@@ -55 +56 @@
     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

trunk/packages/sipb-xen-database/debian/changelog

@@ +1 @@
+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
 

trunk/packages/xvm-devconfig/debian/changelog

@@ -3 +3 @@
   * remove deprecated /etc/invirt/{hosts,realm}
   * add apt section with keyid
+  * add network section with gateway, netmask
 
- -- Greg Price <price@mit.edu>  Sat,  2 Aug 2008 21:56:26 -0400
+ -- Greg Price <price@mit.edu>  Sun,  3 Aug 2008 01:17:57 -0400
 
 xvm-devconfig (0.4) unstable; urgency=low

trunk/packages/xvm-devconfig/files/etc/invirt/master.yaml

@@ -36 +36 @@
  rootip: 18.181.0.62
 
+network:
+ gateway: 18.181.0.1
+ netmask: 255.255.0.0
+
 web:
  baseuri: https://xvm.mit.edu/