From 8adb5e0bc15799d813d1aeed1296c1b036fba570 Mon Sep 17 00:00:00 2001
From: Fredrik Thulin <fredrik@thulin.net>
Date: Tue, 27 May 2014 10:34:08 +0200
Subject: set up br0

---
 cdr1.sunet.se/overlay/etc/network/interfaces | 52 +++++++++++++++-------------
 1 file changed, 27 insertions(+), 25 deletions(-)

(limited to 'cdr1.sunet.se')

diff --git a/cdr1.sunet.se/overlay/etc/network/interfaces b/cdr1.sunet.se/overlay/etc/network/interfaces
index 7475c35..edcc8fd 100644
--- a/cdr1.sunet.se/overlay/etc/network/interfaces
+++ b/cdr1.sunet.se/overlay/etc/network/interfaces
@@ -22,40 +22,42 @@
 auto lo
 iface lo inet loopback
 
-auto eth0
-iface eth0 inet manual
-bond-master bond0
-bond-primary eth0
+auto em1
+iface em1 inet manual
+      bond-master bond0
+      bond-primary em1
 
-auto eth1
-iface eth1 inet manual
-bond-master bond0
+auto em2
+iface em2 inet manual
+      bond-master bond0
 
 # bond0 is the bonding NIC and can be used like any other normal NIC.
 auto bond0
-iface bond0 inet static
-	address 130.242.125.70
-	netmask 255.255.255.192
-	network 130.242.125.64
-	broadcast 130.242.125.127
-	gateway 130.242.125.65
-	# dns-* options are implemented by the resolvconf package, if installed
-	dns-nameservers 130.242.80.14 130.242.80.99
-	dns-search sunet.se
-	bond-mode active-backup
-	bond-miimon 100
-	bond-slaves none
-
-iface bond0 inet6 static
-      address 2001:6b0:8:4::70
-      netmask 64
-      gateway 2001:6b0:8:4::1
+iface bond0 inet manual
+      bond-mode active-backup
+      bond-miimon 100
+      bond-slaves none
 
 # Bridge interface for KVM guests
 auto br0
-iface br0 inet dhcp
+iface br0 inet static
       pre-up sleep 4  # must make br0 start _after_ bond0 is configured
       bridge_ports bond0
       bridge_stp off
       bridge_fd 0
       bridge_maxwait 0
+      #
+      address 130.242.125.70
+      netmask 255.255.255.192
+      network 130.242.125.64
+      broadcast 130.242.125.127
+      gateway 130.242.125.65
+      # dns-* options are implemented by the resolvconf package, if installed
+      dns-nameservers 130.242.80.14 130.242.80.99
+      dns-search sunet.se
+
+iface br0 inet6 static
+      pre-up sleep 4  # must make br0 start _after_ bond0 is configured
+      address 2001:6b0:8:4::70
+      netmask 64
+      gateway 2001:6b0:8:4::1
-- 
cgit v1.1