Browse code

Merge "Stop setting route pointing back to tenant router"

Jenkins authored on 2016/11/18 10:50:50
Showing 1 changed files
... ...
@@ -371,11 +371,6 @@ function _neutron_configure_router_v4 {
371 371
             fi
372 372
             ROUTER_GW_IP=$(openstack --os-cloud devstack-admin --os-region "$REGION_NAME" port list -c 'Fixed IP Addresses' --device-owner network:router_gateway | awk -F'ip_address'  '{ print $2 }' | cut -f2 -d\' | tr '\n' ' ')
373 373
             die_if_not_set $LINENO ROUTER_GW_IP "Failure retrieving ROUTER_GW_IP"
374
-            local replace_range=${SUBNETPOOL_PREFIX_V4}
375
-            if [[ -z "${SUBNETPOOL_V4_ID}" ]]; then
376
-                replace_range=${FIXED_RANGE}
377
-            fi
378
-            sudo ip route replace $replace_range via $ROUTER_GW_IP
379 374
         fi
380 375
         _neutron_set_router_id
381 376
     fi