Merge "Fix next_hop for metadata service host route on local_subnet"

This commit is contained in:
Zuul 2018-03-26 22:19:32 +00:00 committed by Gerrit Code Review
commit 7a7717e431
1 changed files with 1 additions and 3 deletions

View File

@ -2177,11 +2177,9 @@ def _config_neutron_segments_and_subnets(sdk, ctlplane_id):
s = CONF.get(name)
phynet = name
metadata_nexthop = s.gateway
if name == CONF.local_subnet:
phynet = PHYSICAL_NETWORK
metadata_nexthop = s.gateway
if str(netaddr.IPNetwork(CONF.local_ip).ip) in s.cidr:
metadata_nexthop = str(netaddr.IPNetwork(CONF.local_ip).ip)
host_routes = [{'destination': '169.254.169.254/32',