diff options
| author |   Ed Kern <ejk@cisco.com> | 2017-06-13 18:46:15 -0600 |
|---|---|---|
| committer |   Peter Mikus <pmikus@cisco.com> | 2017-06-14 06:35:55 +0000 |
| commit | 88349038a5923f7323df6f38926f090166a7c60a (patch) | |
| tree | 35cb018d414793b5eee4a0cd65091be8725f183d /resources/tools/testbed-setup/playbooks/files | |
| parent | 53d69321e41aa6fd94abc16c7050314dc2e53f08 (diff) | |
CSIT-597: spot fixes for crudini, interface differences
Change-Id: I7c11a365aa7b0ed673e0ec9a7e6078129d3c63fa
Signed-off-by: Ed Kern <ejk@cisco.com>
Diffstat (limited to 'resources/tools/testbed-setup/playbooks/files')
3 files changed, 26 insertions, 2 deletions
diff --git a/resources/tools/testbed-setup/playbooks/files/interfaces b/resources/tools/testbed-setup/playbooks/files/interfaces index d9514e63b6..25ea35a0c5 100644 --- a/resources/tools/testbed-setup/playbooks/files/interfaces +++ b/resources/tools/testbed-setup/playbooks/files/interfaces @@ -13,5 +13,5 @@ iface br1 inet static gateway {{ ansible_default_ipv4["gateway"] }} dns-nameservers 199.204.44.24 199.204.47.54 bridge_maxwait 0 - bridge_ports eth0 + bridge_ports eth0 eth4 bridge_stp off diff --git a/resources/tools/testbed-setup/playbooks/files/virl/ifup b/resources/tools/testbed-setup/playbooks/files/virl/ifup new file mode 100755 index 0000000000..a4a743ac63 --- /dev/null +++ b/resources/tools/testbed-setup/playbooks/files/virl/ifup @@ -0,0 +1,25 @@ +#! /bin/sh +# Reload the OpenSSH server when an interface comes up, to allow it to start +# listening on new addresses. + +set -e + +# Don't bother to restart sshd when lo is configured. +if [ "$IFACE" = lo ]; then + exit 0 +fi + +# Only run from ifup. +if [ "$MODE" != start ]; then + exit 0 +fi + +if [ "$IFACE" = br1 ]; then + /sbin/ip route delete default + /sbin/ip route add default via 10.30.51.1 + /sbin/ifconfig br1:0 {{ virl_l2_ip }} netmask 255.255.255.0 + exit 0 +fi + + +exit 0 diff --git a/resources/tools/testbed-setup/playbooks/files/virl/virl-bootstrap-wrapper b/resources/tools/testbed-setup/playbooks/files/virl/virl-bootstrap-wrapper index ccb326942c..dc7ead804d 100644 --- a/resources/tools/testbed-setup/playbooks/files/virl/virl-bootstrap-wrapper +++ b/resources/tools/testbed-setup/playbooks/files/virl/virl-bootstrap-wrapper @@ -43,7 +43,6 @@ puts "*******************STEP 8************************************************* expect "Which step are you on" send "8\r" -expect "Determining pillar cache" expect "True" puts "*******************STEP 9*************************************************************************************************************************************************" |