openstack/tripleo-heat-templates
Code Issues Proposed changes

Fix errors using multiple-nics templates w/o VLANs defined

Browse Source 
The multiple-nics templates shouldn't require VLANs to be
defined for the networks, since the networks are delivered
on flat interfaces without VLANs. However, since no default
is defined, the templates fail if VLANs are not defined in
network_data.yaml. This change adds a default of "".

Closes-bug: 1784084
Change-Id: I4514ac51729a3156ed263d680e23ef5292fc5fca
This commit is contained in:
Dan Sneddon 2018-07-27 16:08:08 -07:00
parent e87fcba49d
commit 8ec80c7cfd
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
network/config/multiple-nics/compute-dvr.j2.yaml
View File

@ -25,7 +25,7 @@ parameters:
description: IP address/subnet on the {{network.name_lower}} network
type: string
{{network.name}}NetworkVlanID:
default: {{network.vlan}}
default: {{network.vlan|default("")}}
description: Vlan ID for the {{network.name_lower}} network traffic.
type: number
{%- if network.ipv6|default(false) and network.gateway_ipv6|default(false) %}

2
network/config/multiple-nics/controller-v6.j2.yaml
View File

@ -24,7 +24,7 @@ parameters:
description: IP address/subnet on the {{network.name_lower}} network
type: string
{{network.name}}NetworkVlanID:
default: {{network.vlan}}
default: {{network.vlan|default("")}}
description: Vlan ID for the {{network.name_lower}} network traffic.
type: number
{%- if network.ipv6|default(false) and network.gateway_ipv6|default(false) %}

2
network/config/multiple-nics/role.role.j2.yaml
View File

@ -23,7 +23,7 @@ parameters:
description: IP address/subnet on the {{network.name_lower}} network
type: string
{{network.name}}NetworkVlanID:
default: {{network.vlan}}
default: {{network.vlan|default("")}}
description: Vlan ID for the {{network.name_lower}} network traffic.
type: number
{%- if network.ipv6|default(false) and network.gateway_ipv6|default(false) %}