From: Ed Kern <ejk@cisco.com>
Date: Wed, 24 May 2017 23:55:27 +0000 (-0600)
Subject: CSIT-597: revert to old style interface naming
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=a2b2ccce0361b6772306db32b922a05c9b738048

CSIT-597: revert to old style interface naming

Change-Id: I0ae5295fe0bd046e643df2d2abf2b88f76f3179f
Signed-off-by: Ed Kern <ejk@cisco.com>
---

diff --git a/resources/tools/testbed-setup/playbooks/01-host-setup.yaml b/resources/tools/testbed-setup/playbooks/01-host-setup.yaml
index fdf03b2f67..a54360890b 100644
--- a/resources/tools/testbed-setup/playbooks/01-host-setup.yaml
+++ b/resources/tools/testbed-setup/playbooks/01-host-setup.yaml
@@ -31,6 +31,10 @@
     apt: name=socat state=present
   - name: install qemu
     apt: name=qemu-system-x86 state=present
+  - name: Old interface naming
+    command: ln -s /dev/null /etc/udev/rules.d/80-net-setup-link.rules
+  - name: update init for old interface naming
+    command: update-initramfs -u
 - hosts: virl
   remote_user: testuser
   sudo: yes
diff --git a/resources/tools/testbed-setup/playbooks/files/interfaces b/resources/tools/testbed-setup/playbooks/files/interfaces
index 734d8cd18f..d9514e63b6 100644
--- a/resources/tools/testbed-setup/playbooks/files/interfaces
+++ b/resources/tools/testbed-setup/playbooks/files/interfaces
@@ -6,9 +6,12 @@ auto lo
 iface lo inet loopback
 
 # The primary network interface
-auto {{ ansible_default_ipv4["interface"] }}
-iface {{ ansible_default_ipv4["interface"] }} inet static
+auto br1
+iface br1 inet static
     address {{ ansible_default_ipv4["address"] }}
     netmask {{ ansible_default_ipv4["netmask"] }}
     gateway {{ ansible_default_ipv4["gateway"] }}
     dns-nameservers 199.204.44.24 199.204.47.54
+    bridge_maxwait 0
+    bridge_ports eth0
+    bridge_stp off