Routed Networks - THT - VLAN ID from base subnet used for all roles

[Harald Jensås]

We define subnet specific VLAN parameters in network-environment.yaml:
https://github.com/openstack/tripleo-heat-templates/blob/92766d5a69d967332f3ec8c63684974e12e589ce/environments/network-environment.j2.yaml#L82

However in <THT>/network/config/ sample templates the parameter for the base subnet's VLAN ID is always used:
https://github.com/openstack/tripleo-heat-templates/blob/941cf073c74cd77eb24b9c6fbc108dc2021e9ddb/network/config/single-nic-vlans/role.role.j2.yaml#L162

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/645159
Committed: https://git.openstack.org/cgit/openstack/tripleo-heat-templates/commit/?id=59c5e23c54d09e32e4197eb9ddcd8d6459c1e80b
Submitter: Zuul
Branch: master

commit 59c5e23c54d09e32e4197eb9ddcd8d6459c1e80b
Author: Harald Jensås <email address hidden>
Date: Thu Mar 21 10:02:25 2019 +0100

    Jinja automation for %network%NetworkVlanId

    Per-subnet vlan id parameters are already rendered in
    network-environment.yaml. This change uses networks data
    and roles data so that per-subnet vlan id param is used
    when passing the relevant NetworkVlanId data to nic-config
    templates.

    By using the generic %network%NetworkVlanId (no subnet suffix)
    in nic-config templates instead of %network%NetworkVlanId_%subnet%,
    this allow homogeneous computes in multiple sites to use the
    same nic-config template.

    Also use type: number for all vlan parameters.

    Closes-Bug: #1821043
    Change-Id: Id8e76ae7c41a562f5c47d911c42aa18001c11be1

[OpenStack Infra (hudson-openstack)]

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