X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fganeti2%2Ftemplates%2Finstance-debootstrap%2Fhooks%2F00-dsa-configure-networking.erb;h=772c91bf07673416d47d7bbfe024271c7a212f82;hb=c82e5e29c32f43028cb668dd653c98af9391806d;hp=6878e13182d1bfb01249cf4d54fd04af11152d5c;hpb=dd401e461e4a6e250300bede2d3ab65d1193fe62;p=dsa-puppet.git

diff --git a/modules/ganeti2/templates/instance-debootstrap/hooks/00-dsa-configure-networking.erb b/modules/ganeti2/templates/instance-debootstrap/hooks/00-dsa-configure-networking.erb
index 6878e131..772c91bf 100755
--- a/modules/ganeti2/templates/instance-debootstrap/hooks/00-dsa-configure-networking.erb
+++ b/modules/ganeti2/templates/instance-debootstrap/hooks/00-dsa-configure-networking.erb
@@ -19,9 +19,11 @@ fi
 
 rm -f $TARGET/etc/udev/rules.d/70-persistent-net.rules
 
-if [ "$NIC_COUNT" -gt 0 ]; then
+touch $TARGET/etc/udev/rules.d/75-cd-aliases-generator.rules
+touch $TARGET/etc/udev/rules.d/75-persistent-net-generator.rules
 
-  cat > $TARGET/etc/network/interfaces <<EOF
+if [ "$NIC_COUNT" -ge 1 ]; then
+  cat > $TARGET/etc/network/interfaces << EOF
 # /etc/network/interfaces
 
 auto lo
@@ -33,10 +35,27 @@ iface eth0 inet static
   netmask 255.255.255.0
   gateway 206.12.19.254
 
+  pre-up /sbin/sysctl -w net.ipv6.conf.\$IFACE.accept_ra=0 || true
+  up   ip addr add 2607:f8f0:610:4000:6564:0a62:\$IF_ADDRESS/64 dev \$IFACE
+  up   ip r add default via 2607:f8f0:610:4000::1 src 2607:f8f0:610:4000:6564:0a62:\$IF_ADDRESS dev \$IFACE
+  down ip r del default via 2607:f8f0:610:4000::1 src 2607:f8f0:610:4000:6564:0a62:\$IF_ADDRESS dev \$IFACE
+  down ip addr del 2607:f8f0:610:4000:6564:0a62:\$IF_ADDRESS/64 dev \$IFACE
 EOF
 
 fi
 
+if [ "$NIC_COUNT" -ge 2 ]; then
+  cat >> $TARGET/etc/network/interfaces << EOF
+
+auto eth1
+iface eth1 inet static
+  address ${NIC_1_IP}
+  netmask 255.255.255.0
+EOF
+
+fi
+
+
 cat > $TARGET/etc/resolv.conf <<EOF
 # /etc/resolv.conf
 search debprivate-ubc.debian.org debian.org
@@ -44,4 +63,18 @@ nameserver 206.12.19.20
 nameserver 206.12.19.21
 EOF
 
+# clean up etc/hosts
+cat > $TARGET/etc/hosts
+127.0.0.1       localhost
+
+# The following lines are desirable for IPv6 capable hosts
+::1     ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+EOF
+
 exit 0
+
+# vim:set syn=sh: