aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEd Kern <ejk@cisco.com>2017-05-24 17:55:27 -0600
committerEd Kern <ejk@cisco.com>2017-05-24 17:55:27 -0600
commita2b2ccce0361b6772306db32b922a05c9b738048 (patch)
tree1ec5cefbafac196a677701b1b9186b05c849b00d
parentac97c3d8e47cb73f7502db6b3bb6498c4f6d98fd (diff)
CSIT-597: revert to old style interface naming
Change-Id: I0ae5295fe0bd046e643df2d2abf2b88f76f3179f Signed-off-by: Ed Kern <ejk@cisco.com>
-rw-r--r--resources/tools/testbed-setup/playbooks/01-host-setup.yaml4
-rw-r--r--resources/tools/testbed-setup/playbooks/files/interfaces7
2 files changed, 9 insertions, 2 deletions
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