openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Do not create NetworkVlanID is the value is not defined"

This commit is contained in:
Zuul 2018-03-28 15:41:47 +00:00 committed by Gerrit Code Review
parent 4ed5eae601 ddc7192999
commit e6750c6a06
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/network-environment-v6.j2.yaml
View File

@ -32,7 +32,9 @@ parameter_defaults:
{%- endfor %}
# Customize the VLAN IDs to match the local environment
{%- for network in networks if network.enabled|default(true) %}
{%- if network.vlan is defined %}
{{network.name}}NetworkVlanID: {{network.vlan}}
{%- endif %}
{%- endfor %}
# Customize the IP ranges on each network to use for static IPs and VIPs
{%- for network in networks if network.enabled|default(true) %}

2
environments/network-environment.j2.yaml
View File

@ -27,7 +27,9 @@ parameter_defaults:
{%- endfor %}
# Customize the VLAN IDs to match the local environment
{%- for network in networks if network.enabled|default(true) %}
{%- if network.vlan is defined %}
{{network.name}}NetworkVlanID: {{network.vlan}}
{%- endif %}
{%- endfor %}
{%- for network in networks if network.enabled|default(true) %}
{%- if network.name == 'External' %}