commit 1493bdeba24674f6634160d51b8081c571df4017
author Jenkins <jenkins@review.openstack.org> Fri Nov 18 01:50:50 2016 +0000
committer Gerrit Code Review <review@openstack.org> Fri Nov 18 01:50:50 2016 +0000
tree f671053b4c8ed681b9be33588fcd5ab6d9d3b394
parent 3c251b802302d7af8990ce2c9f9eec908bc90043
parent df5e69114fa2af663c50e734b4a842c727e6a7e9

Merge "Stop setting route pointing back to tenant router"

lib/neutron_plugins/services/l3

diff --git a/lib/neutron_plugins/services/l3 b/lib/neutron_plugins/services/l3
index ddc6155..f004ce1 100644
--- a/lib/neutron_plugins/services/l3
+++ b/lib/neutron_plugins/services/l3
@@ -371,11 +371,6 @@
             fi
             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' ' ')
             die_if_not_set $LINENO ROUTER_GW_IP "Failure retrieving ROUTER_GW_IP"
-            local replace_range=${SUBNETPOOL_PREFIX_V4}
-            if [[ -z "${SUBNETPOOL_V4_ID}" ]]; then
-                replace_range=${FIXED_RANGE}
-            fi
-            sudo ip route replace $replace_range via $ROUTER_GW_IP
         fi
         _neutron_set_router_id
     fi