Description of problem:

When using the multiple-nics templates the deployment fails because there is no default VLAN ids in the processed nic-configs templates


Version-Release number of selected component (if applicable): 13


How reproducible:


Steps to Reproduce:
1. Create a copy of /usr/share/openstack-tripleo-heat-templates/network/config/multiple-nics/ in your templates directory
2. Process the template using /usr/share/openstack-tripleo-heat-templates/tools/process-templates.py -p templates/ -r roles_data.yaml -n network_data.yaml -o /tmp/processed
3. Use the resulting nic-config templates to deploy an overcloud

Actual results:

Deployment fails with the following error:

2018-07-25 14:55:08Z [overcloud.Compute.0]: CREATE_FAILED  resources[0]: Property error: resources.NetworkConfig.properties: Property InternalApiNetworkVlanID not assigned
2018-07-25 14:55:08Z [overcloud.Compute]: UPDATE_FAILED  Resource CREATE failed: resources[0]: Property error: resources.NetworkConfig.properties: Property InternalApiNetworkVlanID not assigned
2018-07-25 14:55:09Z [overcloud.Compute]: CREATE_FAILED  resources.Compute: Resource CREATE failed: resources[0]: Property error: resources.NetworkConfig.properties: Property InternalApiNetworkVlanID not assigne
d
2018-07-25 14:55:09Z [overcloud]: CREATE_FAILED  Resource CREATE failed: resources.Compute: Resource CREATE failed: resources[0]: Property error: resources.NetworkConfig.properties: Property InternalApiNetworkVl
anID not assigned


Expected results:

OpenStack deployed

Additional info:

We think that the issue is in the jinja template:

# /usr/share/openstack-tripleo-heat-templates/network/config/multiple-nics/compute-dvr.j2.yaml

[...]
  {%- for network in networks %}
  {{network.name}}NetworkVlanID:
    default: {{network.vlan}}
    description: Vlan ID for the {{network.name_lower}} network traffic.
    type: number
  {%- endfor %}
[...]

This condition could be used to check if network.vlan is defined.