Use the netmask and gateway specific to the NIC for the VM in question

in the kernel boot line when autoinstalling, instead of parameters from
the global cluster config.

diff --git a/debian/changelog b/debian/changelog
index 9c1ef64..3bb90b5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
 invirt-xen-config (0.0.54) unstable; urgency=low
 
   * invirt-database: pass through parameters for the "other" IP address,
-    if any, to vif-invirtroute.
+    if any, to vif-invirtroute.  Also, use the netmask and gateway for
+    the VM when autoinstalling, rather than parameters from the global
+    cluster configuration.
   * vif-invirtroute: if there is an "other" IP address, DNAT it to the
     primary IP, set up routing to get it to the VM, and arp for it.
     Also, cut out the nonsense with backgrounding arpspoof, sleeping, and

diff --git a/invirt-database b/invirt-database
index ade475d..936c2a7 100644 (file)
--- a/invirt-database
+++ b/invirt-database
@@ -95,7 +95,7 @@ if 'installer_options' in locals(): #Installer
         n = machine.nics[0]
         extra = 'ro noresume'
         extra += (' ip=%s::%s:%s:%s:eth0:off'
-                  % (n.ip, config.dhcp.gateway, config.dhcp.netmask, machine.name))
+                  % (n.ip, n.gateway, n.netmask, machine.name))
         extra += ' %s' % installer_options
         root = '/dev/hdb1'
     codepath = None