openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Only add internal_api_virtual_ip if InternalApi in network_data"

Browse Source
This commit is contained in:
Zuul 2019-01-10 08:31:58 +00:00 committed by Gerrit Code Review
commit 0435f6cc23
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,7 @@
{%- set _networks = [] -%}
{%- for network in networks -%}
{%- set _networks = _networks.append(network.name) -%}
{%- endfor -%}
heat_template_version: rocky
description: 'All Nodes Config for Puppet'
@ -198,8 +202,10 @@ 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]}
{%- if 'InternalApi' in _networks %}
# the internal_api_virtual_ip is needed for contrail only
internal_api_virtual_ip: {get_param: [NetVipMap, {get_param: InternalApiNetName}]}
{%- endif %}
network_virtual_ips:
{%- for network in networks if network.vip|default(false) %}
# External virtual ip is currently being handled separately as public_virtual_ip.