openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Rename external network VIP, drop special case 

The heat VIP resource on the external network is
PublicVirtualIP. The name of the port object in
neutron has also traditionally been 'public_virtual_ip'.

There is no need to special case the port name, removing
this logic will simplify the jinja2 rendering.

NOTE: Making the name format standard also keeps VIP
detection code in https://review.opendev.org/750671 nice
and simple, without the extra cases.

Change-Id: I1e6e9756af336a423e554b95b33077c2c97a3d4c
This commit is contained in:
Harald Jensås 2020-09-15 15:12:39 +02:00
parent 918ea0c41c
commit 0a4a60051b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
overcloud.j2.yaml
View File

@ -1025,13 +1025,10 @@ resources:
- ctlplane_subnet_cidr_set
- {get_param: ControlPlaneSubnetCidr}
- {str_split: ['/', {get_attr: [ControlVirtualIP, subnets, 0, cidr]}, 1]}
{%- if network.name == 'External' %}
PortName: public_virtual_ip
DnsName: {str_split: ['.', {get_param: CloudName}, 0]}
{%- else %}
PortName: {{network.name_lower}}_virtual_ip
{%- endif %}
{%- if network.name == 'InternalApi' %}
{%- if network.name == 'External' %}
DnsName: {str_split: ['.', {get_param: CloudName}, 0]}
{%- elif network.name == 'InternalApi' %}
DnsName: {str_split: ['.', {get_param: CloudNameInternal}, 0]}
{%- elif network.name == 'StorageMgmt' %}
DnsName: {str_split: ['.', {get_param: CloudNameStorageManagement}, 0]}