Description of problem:
When setting up network_data.yaml without vlans and using the multiple-nics network config, overcloud deploy fails with the following errors:

2018-09-24 23:31:32Z [overcloud.Compute.0]: CREATE_FAILED  resources[0]: Property error: resources.NetworkConfig.properties: Property TenantNetworkVlanID not assigned
2018-09-24 23:31:32Z [overcloud.Compute]: UPDATE_FAILED  Resource CREATE failed: resources[0]: Property error: resources.NetworkConfig.properties: Property TenantNetworkVlanID not assigned
2018-09-24 23:31:33Z [overcloud.CephStorage.2]: CREATE_FAILED  resources[2]: Property error: resources.NetworkConfig.properties: Property TenantNetworkVlanID not assigned
2018-09-24 23:31:33Z [overcloud.CephStorage]: UPDATE_FAILED  Resource CREATE failed: resources[2]: Property error: resources.NetworkConfig.properties: Property TenantNetworkVlanID not assigned
2018-09-24 23:31:33Z [overcloud.Compute]: CREATE_FAILED  resources.Compute: Resource CREATE failed: resources[0]: Property error: resources.NetworkConfig.properties: Property TenantNetworkVlanID not assigned
2018-09-24 23:31:33Z [overcloud]: CREATE_FAILED  Resource CREATE failed: resources.Compute: Resource CREATE failed: resources[0]: Property error: resources.NetworkConfig.properties: Property TenantNetworkVlanID not assigned
2018-09-24 23:31:33Z [overcloud.ObjectStorage.2]: CREATE_FAILED  resources[2]: Property error: resources.NetworkConfig.properties: Property TenantNetworkVlanID not assigned

network_data.yaml states vlans are optional for multiple-nics:

# vlan: vlan for the network (optional)

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

OSP 13 with Packages of todays date

How reproducible:
Consistent

Steps to Reproduce:
With network_data.yaml (default with vlans removed)

- name: Storage
  vip: true
  name_lower: storage
  ip_subnet: '172.16.1.0/24'
  allocation_pools: [{'start': '172.16.1.4', 'end': '172.16.1.250'}]
  ipv6_subnet: 'fd00:fd00:fd00:3000::/64'
  ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:3000::10', 'end': 'fd00:fd00:fd00:3000:ffff:ffff:ffff:fffe'}]
- name: StorageMgmt
  name_lower: storage_mgmt
  vip: true
  ip_subnet: '172.16.3.0/24'
  allocation_pools: [{'start': '172.16.3.4', 'end': '172.16.3.250'}]
  ipv6_subnet: 'fd00:fd00:fd00:4000::/64'
  ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:4000::10', 'end': 'fd00:fd00:fd00:4000:ffff:ffff:ffff:fffe'}]
- name: InternalApi
  name_lower: internal_api
  vip: true
  ip_subnet: '172.16.2.0/24'
  allocation_pools: [{'start': '172.16.2.4', 'end': '172.16.2.250'}]
  ipv6_subnet: 'fd00:fd00:fd00:2000::/64'
  ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:2000::10', 'end': 'fd00:fd00:fd00:2000:ffff:ffff:ffff:fffe'}]
- name: Tenant
  vip: false  # Tenant network does not use VIPs
  name_lower: tenant
  vlan: 50
  ip_subnet: '172.16.0.0/24'
  allocation_pools: [{'start': '172.16.0.4', 'end': '172.16.0.250'}]
  # Note that tenant tunneling is only compatible with IPv4 addressing at this time.
  ipv6_subnet: 'fd00:fd00:fd00:5000::/64'
  ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:5000::10', 'end': 'fd00:fd00:fd00:5000:ffff:ffff:ffff:fffe'}]
- name: External
  vip: true
  name_lower: external
  ip_subnet: '10.0.0.0/24'
  allocation_pools: [{'start': '10.0.0.4', 'end': '10.0.0.250'}]
  gateway_ip: '10.0.0.1'
  ipv6_subnet: '2001:db8:fd00:1000::/64'
  ipv6_allocation_pools: [{'start': '2001:db8:fd00:1000::10', 'end': '2001:db8:fd00:1000:ffff:ffff:ffff:fffe'}]
  gateway_ipv6: '2001:db8:fd00:1000::1'
- name: Management
  # Management network is enabled by default for backwards-compatibility, but
  # is not included in any roles by default. Add to role definitions to use.
  enabled: true
  vip: false  # Management network does not use VIPs
  name_lower: management
  ip_subnet: '10.0.1.0/24'
  allocation_pools: [{'start': '10.0.1.4', 'end': '10.0.1.250'}]
  ipv6_subnet: 'fd00:fd00:fd00:6000::/64'
  ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:6000::10', 'end': 'fd00:fd00:fd00:6000:ffff:ffff:ffff:fffe'}]

_____

openstack overcloud deploy --templates \
   -e /home/stack/templates/node-info.yaml \
   -e /home/stack/templates/overcloud_images.yaml \
   -e /usr/share/openstack-tripleo-heat-templates/environments/net-multiple-nics.yaml \
   -n /home/stack/templates/network_data.yaml \
   -e /usr/share/openstack-tripleo-heat-templates/environments/ceph-ansible/ceph-ansible.yaml \
   -e /home/stack/templates/ceph-custom-config.yaml \
   --ntp-server pool.ntp.org \

Actual results:

See error above

Expected results:

Completion of overcloud deploy

Additional info:

Bug appears to have been raised and fixed in but still get error

https://bugs.launchpad.net/tripleo/+bug/1784084