Merge "Fix next_hop for metadata service host route on local_subnet" into stable/queens

This commit is contained in:
Zuul
2018-03-28 21:19:52 +00:00
committed by Gerrit Code Review
2 changed files with 7 additions and 3 deletions

View File

@@ -2195,11 +2195,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',

View File

@@ -0,0 +1,6 @@
---
fixes:
- |
Fixes `bug 1757418 <https://bugs.launchpad.net/tripleo/+bug/1757418>`__.
The route to the metadata service on the local subnet was incorrectly set
to the gateway. It is now set to the ``local_ip`` of the undercloud.