From e3053749277e7ef0a96c40b3a44bd2286926b293 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 9 May 2018 19:36:34 +0200 Subject: [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 (cherry picked from commit 0bc600fd4d269a17ebcf28700b46e199d66c25db) --- .../classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack') 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: -- cgit 1.2.3-korg