openstack/tripleo-heat-templates
Code Issues Proposed changes

Add network data for the undercloud

Browse Source 
The undercloud needs the External network for the external VIP
address. It uses the _from_pool template creating a fake neutron
port.

Other networks are not required, and should be removed to optimize
the number of heat resources and plan rendering.

NOTE: Skips validation of network_data_undercloud.yaml against
network_data.yaml, as is already done to openshift and routed
networks networks data examples.

Related Bug: #1809313
Change-Id: Ib11a134df93e59947168b40bc71fb1da9172d4ac
This commit is contained in:
Harald Jensås 2019-01-03 14:59:41 +01:00
parent 53027484ae
commit c1116e59c1
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
network_data_undercloud.yaml Normal file
View File

@ -0,0 +1,3 @@
- name: External
vip: true
name_lower: external

5
tools/yaml-validate.py
View File

@ -1125,8 +1125,9 @@ def validate(filename, param_map):
# NOTE(mandre): Same goes for the openshift network data where it # NOTE(mandre): Same goes for the openshift network data where it
# contains only a subset of the overcloud networks. # contains only a subset of the overcloud networks.
if (filename.startswith('./network_data_') and if (filename.startswith('./network_data_') and
not (filename.endswith('routed.yaml') or not filename.endswith(('routed.yaml',
filename.endswith('openshift.yaml'))): 'openshift.yaml',
'undercloud.yaml'))):
result = validate_network_data_file(filename) result = validate_network_data_file(filename)
retval |= result retval |= result
else: else: