[ha] Fix tenant NIC OS config for VLAN ranges 51/56251/1
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sun, 22 Apr 2018 00:07:27 +0000 (02:07 +0200)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Mon, 23 Apr 2018 10:22:43 +0000 (10:22 +0000)
commit0842bf5367a04a1434f13ba0870e4fcd1f19c6b1
tree5e35f69d8ae9da20cb6e7b6bc8121ddaca17df22
parent8f97ead1ee10e6580f42de0e42412edcb4d91168
[ha] Fix tenant NIC OS config for VLAN ranges

Previous commits added support for tenant VLAN range parametrization,
yet failed to accomodate the new VLAN range representation ('M:N') in
existing `linux.network.interfaces` reclass configuration.

This lead to the silent removal of <nic_private>.<vlan_private> from
interfaces file and for `br-mesh` to try to use <nic_private> instead
of <nic_private>.<vlan_private>, conflicting with `br-floating`.

Stick to using the first VLAN in the tenant range.

JIRA: FUEL-365

Change-Id: I88f7263159f1742dba3b6e36649c9344f2932c5f
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit cfc5988be48d1317244e71fd7919480db18745d4)
mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute_pdf.yml.j2
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2