openstack/tripleo-heat-templates
Code Issues Proposed changes

Revert "Only add internal_api_virtual_ip if InternalApi is in network_data"

Browse Source 
This reverts commit 8cfaf354d2.

Change-Id: Ib8ff69a4bc869de21ad838b3bc6c38a8676036c6
This commit is contained in:
Tim Rozet 2018-06-04 20:26:31 +00:00
parent 8cfaf354d2
commit 3b81a45281
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
puppet/all-nodes-config.j2.yaml
View File

@ -176,6 +176,8 @@ resources:
get_param: [NetVipMap, {get_param: [ServiceNetMap, keystone_public_api_network]}]
public_virtual_ip: {get_param: [NetVipMap, {get_param: ExternalNetName}]}
controller_virtual_ip: {get_param: [NetVipMap, ctlplane]}
# the internal_api_virtual_ip is needed for contrail only
internal_api_virtual_ip: {get_param: [NetVipMap, {get_param: InternalApiNetName}]}
network_virtual_ips:
{%- for network in networks if network.vip|default(false) %}
# External virtual ip is currently being handled separately as public_virtual_ip.
@ -185,10 +187,6 @@ resources:
ip_address: {get_param: [NetVipMap, {get_param: {{network.name}}NetName}]}
index: {{loop.index}}
{%- endif %}
{%- if network.name == 'InternalApi' %}
# the internal_api_virtual_ip is needed for contrail only
internal_api_virtual_ip: {get_param: [NetVipMap, {get_param: InternalApiNetName}]}
{%- endif %}
{%- endfor %}
redis_vip: {get_param: RedisVirtualIP}
{%- for network in networks if network.name == 'StorageNFS' %}