diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-05-09 19:36:34 +0200 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-05-22 15:48:08 +0000 |
| commit | e3053749277e7ef0a96c40b3a44bd2286926b293 (patch) | |
| tree | 5a4150ab2629c796203b819ff7762d7d4cafc4bc | |
| parent | 9ea104f5af69d2df15ab615f1e2382a03a5f61c5 (diff) | |
[xdf] Fix parsing of non-range private vlan(s)
Private (tenant) vlan range support introduced a regression in parsing
PDF/IDF with a single vlan (no range) due to the value being
interpreted as an int instead of string.
Change-Id: Id5d67c4c516a9bb807ffa5e111ead5cbcee7e2ca
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 0bc600fd4d269a17ebcf28700b46e199d66c25db)
4 files changed, 5 insertions, 3 deletions
diff --git a/mcp/reclass/classes/cluster/.gitignore b/mcp/reclass/classes/cluster/.gitignore index a6b1b7d56..7d40a2bec 100644 --- a/mcp/reclass/classes/cluster/.gitignore +++ b/mcp/reclass/classes/cluster/.gitignore @@ -15,3 +15,5 @@ mcp-pike-ovn-ha/infra/init_vcp.yml mcp-pike-ovn-ha/infra/kvm.yml mcp-pike-odl-ha/opendaylight/control.yml mcp-pike-odl-ha/openstack/init.yml +mcp-pike-odl-noha/infra/config.yml +mcp-pike-odl-noha/openstack/compute.yml diff --git a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 index 912537f8f..7cf4c8864 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 @@ -8,7 +8,7 @@ {%- import 'net_map.j2' as nm with context %} {#- Filter-out NIC duplicates by constructing a dict (used NICs only) #} {%- set nics = { nm.cmp001.nic_private: True } %} -{%- set vlan_private_start = nm.vlan_private.rsplit('-')[0] %} +{%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %} {%- set vlans = { vlan_private_start: nm.cmp001.nic_private } %} --- parameters: diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute_pdf.yml.j2 index 912537f8f..7cf4c8864 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-ovn-ha/openstack/compute_pdf.yml.j2 @@ -8,7 +8,7 @@ {%- import 'net_map.j2' as nm with context %} {#- Filter-out NIC duplicates by constructing a dict (used NICs only) #} {%- set nics = { nm.cmp001.nic_private: True } %} -{%- set vlan_private_start = nm.vlan_private.rsplit('-')[0] %} +{%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %} {%- set vlans = { vlan_private_start: nm.cmp001.nic_private } %} --- parameters: diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 index 912537f8f..7cf4c8864 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 @@ -8,7 +8,7 @@ {%- import 'net_map.j2' as nm with context %} {#- Filter-out NIC duplicates by constructing a dict (used NICs only) #} {%- set nics = { nm.cmp001.nic_private: True } %} -{%- set vlan_private_start = nm.vlan_private.rsplit('-')[0] %} +{%- set vlan_private_start = (nm.vlan_private | string).rsplit('-')[0] %} {%- set vlans = { vlan_private_start: nm.cmp001.nic_private } %} --- parameters: |