Browse code

Merge "Use ip route replace to avoid the existing route"

Jenkins authored on 2015/07/01 01:55:18
Showing 1 changed files
... ...
@@ -722,7 +722,7 @@ function start_neutron_agents {
722 722
                 sudo ip addr del $IP dev $PUBLIC_INTERFACE
723 723
                 sudo ip addr add $IP dev $OVS_PHYSICAL_BRIDGE
724 724
             done
725
-            sudo route add -net $FIXED_RANGE gw $NETWORK_GATEWAY dev $OVS_PHYSICAL_BRIDGE
725
+            sudo ip route replace $FIXED_RANGE via $NETWORK_GATEWAY dev $OVS_PHYSICAL_BRIDGE
726 726
         fi
727 727
     fi
728 728
 
... ...
@@ -1286,7 +1286,7 @@ function _neutron_configure_router_v4 {
1286 1286
             fi
1287 1287
             ROUTER_GW_IP=`neutron port-list -c fixed_ips -c device_owner | grep router_gateway | awk -F '"' -v subnet_id=$PUB_SUBNET_ID '$4 == subnet_id { print $8; }'`
1288 1288
             die_if_not_set $LINENO ROUTER_GW_IP "Failure retrieving ROUTER_GW_IP"
1289
-            sudo route add -net $FIXED_RANGE gw $ROUTER_GW_IP
1289
+            sudo ip route replace  $FIXED_RANGE via $ROUTER_GW_IP
1290 1290
         fi
1291 1291
         _neutron_set_router_id
1292 1292
     fi
... ...
@@ -1321,7 +1321,7 @@ function _neutron_configure_router_v6 {
1321 1321
 
1322 1322
             # Configure interface for public bridge
1323 1323
             sudo ip -6 addr add $ipv6_ext_gw_ip/$ipv6_cidr_len dev $ext_gw_interface
1324
-            sudo ip -6 route add $FIXED_RANGE_V6 via $IPV6_ROUTER_GW_IP dev $ext_gw_interface
1324
+            sudo ip -6 route replace $FIXED_RANGE_V6 via $IPV6_ROUTER_GW_IP dev $ext_gw_interface
1325 1325
         fi
1326 1326
         _neutron_set_router_id
1327 1327
     fi