openstack/devstack
Code Issues Proposed changes

Merge "Stop setting route pointing back to tenant router"

Browse Source
This commit is contained in:
Jenkins
2016-11-18 01:50:50 +00:00
committed by Gerrit Code Review
parent 3c251b8023 df5e69114f
commit 1493bdeba2
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/neutron_plugins/services/l3
View File

@@ -371,11 +371,6 @@ function _neutron_configure_router_v4 {
fi 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' ' ') 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" 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 fi
_neutron_set_router_id _neutron_set_router_id
fi fi