diff options
author | Amrith Kumar <amrith@amrith.org> | 2016-10-17 11:21:29 -0400 |
---|---|---|
committer | amrith <amrith@tesora.com> | 2016-11-02 18:21:12 +0000 |
commit | bb941f7d51721a1f40f6411e694a3041ed49b34e (patch) | |
tree | 77d3c322221d8148191869559283bd13feeee6f2 | |
parent | a8adac9456521f8498898d6abc3a3b291bf5f773 (diff) | |
download | trove-bb941f7d51721a1f40f6411e694a3041ed49b34e.tar.gz |
Change the way trovestack figures the default network
With neutron, the default network is br-ex and the existing test fails
to handle that properly. This code works fine with both nova
networking and neutron.
Change-Id: Id0d25bf5abb0545a121a4a5e2191fb05d2005f04
Depends-On: I045a3744ef52819f379c0cc2ca4fc2bf552cad5d
Closes-Bug: #1619030
-rwxr-xr-x | integration/scripts/trovestack | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack index adc1ad95..29a1fcb1 100755 --- a/integration/scripts/trovestack +++ b/integration/scripts/trovestack @@ -40,7 +40,7 @@ set -e # Get default host ip from interface function get_default_host_ip() { - host_iface=$(ip route | sed -n '/^default/{ s/.*dev \(\w\+\)\s\+.*/\1/; p; }' | head -1) + host_iface=$(ip route | grep default | awk '{print $5}' | head -1) echo `LC_ALL=C ip -f inet addr show ${host_iface} | awk '/inet/ {split($2,parts,"/"); print parts[1]}' | head -1` } |