openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Support ctlplane subnet host routes from undercloud.conf"

Browse Source
This commit is contained in:
Zuul 2019-03-13 11:53:46 +00:00 committed by Gerrit Code Review
commit 84ac7282cd
2 changed files with 14 additions and 0 deletions

2
extraconfig/post_deploy/undercloud_ctlplane_network.py

@ -205,6 +205,7 @@ def _local_neutron_segments_and_subnets(sdk, ctlplane_id, net_cidrs):
segment = _get_segment(sdk, CONF['physical_network'], ctlplane_id)
host_routes = [{'destination': '169.254.169.254/32',
'nexthop': CONF['local_ip']}]
host_routes += s['HostRoutes']
if subnet:
if CONF['enable_routed_networks'] and subnet.segment_id == None:
# The subnet exists and does not have a segment association. Since
@ -245,6 +246,7 @@ def _remote_neutron_segments_and_subnets(sdk, ctlplane_id, net_cidrs):
metadata_nexthop = s['NetworkGateway']
host_routes = [{'destination': '169.254.169.254/32',
'nexthop': metadata_nexthop}]
host_routes += s['HostRoutes']
subnet = _get_subnet(sdk, s['NetworkCidr'], ctlplane_id)
segment = _get_segment(sdk, phynet, ctlplane_id)
if subnet:

12
releasenotes/notes/ctlplane-undercloud-conf-host-routes-00e981d1f00405d8.yaml Normal file

@ -0,0 +1,12 @@
---
features:
- |
A new option ``host_routes`` are now available for subnet defenitions in
``undercloud.conf``.
- Host routes specified for the *local_subnet* will be added to
the routing table on the Undercloud.
- Host routes for *all* subnets are passed to tripleo-heat-templates so
that the *host_routes* property of the ctlplane subnets are set
accordingly when installing the Undercloud.