From 1ea4713f79a2c1e7e57da73b3bf86eced559f201 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 8 Feb 2018 20:35:44 +0100 Subject: [j2 parsing] Adopt new generate_config features - bump Pharos git submodule for j2 'do' extension + batch mode; - adopt j2 'do' in our templates; - use int filter for 'native' vlan check; - lib.sh: adopt `-i` to remove `ln` hack for net_map.j2; - lib.sh: adopt `-b` to speedup template parsing; NOTE: Bumping Pharos will also bring in the latest changes in pod_config.yml.j2, which include massive IP shifts and updates. JIRA: FUEL-335 Change-Id: I7d3a997b3d8659d5f09f867870fb3a148c1ec6df Signed-off-by: Alexandru Avadanii --- .../classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack') 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 4e0f7d147..a3a86723f 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 @@ -27,7 +27,7 @@ parameters: {%- endfor %} {%- for vlan in vlans %} - {%- if vlan and vlan != 'native' %} + {%- if vlan | int > 0 %} {{ vlans[vlan] }}.{{ vlan }}: enabled: true proto: manual @@ -45,4 +45,4 @@ parameters: netmask: 255.255.255.0 mtu: 1500 use_interfaces: - - {{ nm.cmp001.nic_private }}{% if nm.vlan_private and nm.vlan_private != 'native' %}.{{ nm.vlan_private }}{% endif %} + - {{ nm.cmp001.nic_private }}{% if nm.vlan_private | int > 0 %}.{{ nm.vlan_private }}{% endif %} -- cgit 1.2.3-korg