Merge "Remove network_virtual_ips hard-coded name filter"

This commit is contained in:
Zuul 2021-10-13 03:23:52 +00:00 committed by Gerrit Code Review
commit c44c7dab9f

View File

@ -410,13 +410,9 @@ outputs:
ip_address: {get_param: [NetVipMap, ctlplane]} ip_address: {get_param: [NetVipMap, ctlplane]}
index: 1 index: 1
{%- for network in networks if network.vip|default(false) and network.enabled|default(true) %} {%- for network in networks if network.vip|default(false) and network.enabled|default(true) %}
# External virtual ip is currently being handled separately as public_virtual_ip.
# Likewise, optional StorageNFS virtual ip is handled separately as ganesha_vip.
{%- if network.name != 'External' and network.name != 'StorageNFS' %}
{{network.name_lower}}: {{network.name_lower}}:
ip_address: {get_param: [NetVipMap, {get_param: {{network.name}}NetName}]} ip_address: {get_param: [NetVipMap, {get_param: {{network.name}}NetName}]}
index: {{loop.index + 1}} index: {{loop.index + 1}}
{%- endif %}
{%- endfor %} {%- endfor %}
cloud_names: {get_param: CloudNames} cloud_names: {get_param: CloudNames}
enable_internal_tls: {get_param: EnableInternalTLS} enable_internal_tls: {get_param: EnableInternalTLS}