multiple-nics network templates fail when no VLAN defined

[Dan Sneddon]

The multiple-nics versions of the built-in NIC configuration templates included in tripleo-heat-templates expect the VLAN ID to exist even though they aren't used in the templates. A custom version of network_data.yaml that doesn't include VLAN information for the networks will cause a failure with the multiple-nics templates.

There needs to be a default value, even if the default is an empty string, to avoid an error.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/586721

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/queens
Review: https://review.openstack.org/586722

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/586721
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=8ec80c7cfd94f1a380207283da3cd74dd6e7153b
Submitter: Zuul
Branch: master

commit 8ec80c7cfd94f1a380207283da3cd74dd6e7153b
Author: Dan Sneddon <email address hidden>
Date: Fri Jul 27 16:08:08 2018 -0700

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

    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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/586722
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=4da8dfee18fc3e1b13e48ae44645e8b5da5fd278
Submitter: Zuul
Branch: stable/queens

commit 4da8dfee18fc3e1b13e48ae44645e8b5da5fd278
Author: Dan Sneddon <email address hidden>
Date: Fri Jul 27 16:08:08 2018 -0700

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

    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
    (cherry picked from commit 8ec80c7cfd94f1a380207283da3cd74dd6e7153b)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 8.0.5 release.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tripleo-heat-templates 9.0.0.0rc1 release candidate.