Only add internal_api_virtual_ip if InternalApi in network_data
Add's a conditional to only include internal_api_virtual_ip if InternalApi network is defined in custom networks. According to code comment internal_api_virtual_ip is only used by Contrail. Change-Id: Ifd8f59bd03c9bab1283e580a64957f201eb8f335 Closes-Bug: #1772124
This commit is contained in:
parent
919aedcdf3
commit
868c7685f1
|
@ -1,3 +1,7 @@
|
||||||
|
{%- set _networks = [] -%}
|
||||||
|
{%- for network in networks -%}
|
||||||
|
{%- set _networks = _networks.append(network.name) -%}
|
||||||
|
{%- endfor -%}
|
||||||
heat_template_version: rocky
|
heat_template_version: rocky
|
||||||
description: 'All Nodes Config for Puppet'
|
description: 'All Nodes Config for Puppet'
|
||||||
|
|
||||||
|
@ -198,8 +202,10 @@ resources:
|
||||||
get_param: [NetVipMap, {get_param: [ServiceNetMap, keystone_public_api_network]}]
|
get_param: [NetVipMap, {get_param: [ServiceNetMap, keystone_public_api_network]}]
|
||||||
public_virtual_ip: {get_param: [NetVipMap, {get_param: ExternalNetName}]}
|
public_virtual_ip: {get_param: [NetVipMap, {get_param: ExternalNetName}]}
|
||||||
controller_virtual_ip: {get_param: [NetVipMap, ctlplane]}
|
controller_virtual_ip: {get_param: [NetVipMap, ctlplane]}
|
||||||
|
{%- if 'InternalApi' in _networks %}
|
||||||
# the internal_api_virtual_ip is needed for contrail only
|
# the internal_api_virtual_ip is needed for contrail only
|
||||||
internal_api_virtual_ip: {get_param: [NetVipMap, {get_param: InternalApiNetName}]}
|
internal_api_virtual_ip: {get_param: [NetVipMap, {get_param: InternalApiNetName}]}
|
||||||
|
{%- endif %}
|
||||||
network_virtual_ips:
|
network_virtual_ips:
|
||||||
{%- for network in networks if network.vip|default(false) %}
|
{%- for network in networks if network.vip|default(false) %}
|
||||||
# External virtual ip is currently being handled separately as public_virtual_ip.
|
# External virtual ip is currently being handled separately as public_virtual_ip.
|
||||||
|
|
Loading…
Reference in New Issue