commit ed1a3918abbc33e4333ff41eb85b964dddceb055
author Jenkins <jenkins@review.openstack.org> Sat Nov 14 02:51:39 2015 +0000
committer Gerrit Code Review <review@openstack.org> Sat Nov 14 02:51:39 2015 +0000
tree 94b7f2491e7970b9902bda5344e4f419a7f51044
parent 9f733f9dc1efff27932b574de90761d1669fd6d9
parent 59e86a3aae3ca49ae3a400c1fcc49c53c9328fd2

Merge "Replace default route for inet6"

lib/neutron-legacy

diff --git a/lib/neutron-legacy b/lib/neutron-legacy
index 0e7ce26..cfa70d2 100644
--- a/lib/neutron-legacy
+++ b/lib/neutron-legacy
@@ -799,7 +799,7 @@
         local IP_ADD=""
         local IP_DEL=""
         local DEFAULT_ROUTE_GW
-        DEFAULT_ROUTE_GW=$(ip r | awk "/default.+$from_intf/ { print \$3; exit }")
+        DEFAULT_ROUTE_GW=$(ip -f $af r | awk "/default.+$from_intf/ { print \$3; exit }")
         local ADD_OVS_PORT=""
 
         if [[ $af == "inet" ]]; then
@@ -811,7 +811,7 @@
         fi
 
         if [ "$DEFAULT_ROUTE_GW" != "" ]; then
-            ADD_DEFAULT_ROUTE="sudo ip r replace default via $DEFAULT_ROUTE_GW dev $to_intf"
+            ADD_DEFAULT_ROUTE="sudo ip -f $af r replace default via $DEFAULT_ROUTE_GW dev $to_intf"
         fi
 
         if [[ "$add_ovs_port" == "True" ]]; then