| commit | 6e23ac8357f98692d3e8aae4e20e354c7dc365bc | [log] [tgz] |
|---|---|---|
| author | David K. Bainbridge <dbainbri@ciena.com> | Wed Dec 07 12:55:41 2016 -0800 |
| committer | David K. Bainbridge <dbainbri@ciena.com> | Wed Jan 04 06:48:47 2017 -0800 |
| tree | ee477e7e5bbfb6c4a55d1f17a7a84e254798b635 | |
| parent | ae6976c004b349512dde0ec019c826721019afe3 [diff] |
CORD-654 configure MAAS via ansible module Change-Id: I9f1b3b83b41d2cf1e87660d4a50fd3267ad1679a
diff --git a/roles/onos-fabric/files/bin/ping-test.sh b/roles/onos-fabric/files/bin/ping-test.sh index d7b894e..4bbcef9 100755 --- a/roles/onos-fabric/files/bin/ping-test.sh +++ b/roles/onos-fabric/files/bin/ping-test.sh
@@ -2,7 +2,7 @@ HOSTS="10.3.1.1 10.3.1.2 10.3.2.1 10.3.2.2 10.3.1.254 10.3.2.254 192.168.10.1 8.8.8.8" -ME=$(ifconfig | grep "10\.3\.[0-9]\.[0-9]" | sed -e 's/.*addr:\(10\.3\.[0-9]\.[0-9]\).*/\1/g' 2> /dev/null) +ME=$(ifconfig | grep "10\.3\.[0-9]\.[0-9]" | sed -e 's/.*addr:\(10\.3\.[0-9]\.[0-9]\).*/\1/g' 2> /dev/null) echo "FROM: $ME" for TO in $HOSTS; do T=$(ping -q -c 1 -W 1 -I eth0 $TO | grep rtt | awk '{print $4}' | sed -e 's|/| |g') #sed -e 's|r| |')
diff --git a/roles/onos-fabric/templates/fabric-network-config.json.j2 b/roles/onos-fabric/templates/fabric-network-config.json.j2 index f39cf60..f29134c 100644 --- a/roles/onos-fabric/templates/fabric-network-config.json.j2 +++ b/roles/onos-fabric/templates/fabric-network-config.json.j2
@@ -212,7 +212,7 @@ "org.onosproject.core" : { "core" : { "linkDiscoveryMode" : "STRICT" // enable strict link validation - } + } } } }