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-common-ha/infra/kvm_pdf.yml.j2 | 8 ++++---- .../cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 | 6 +++--- .../classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 | 4 ++-- .../cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 | 2 +- .../classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) (limited to 'mcp/reclass/classes') diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm_pdf.yml.j2 index 120b6fb7e..97166c62c 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm_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 @@ -44,7 +44,7 @@ parameters: proto: dhcp type: bridge use_interfaces: - - {{ nm.ctl01.nic_admin }}{% if nm.vlan_admin and nm.vlan_admin != 'native' %}.{{ nm.vlan_admin }}{% endif %} + - {{ nm.ctl01.nic_admin }}{% if nm.vlan_admin | int > 0 %}.{{ nm.vlan_admin }}{% endif %} noifupdown: true br-ctl: enabled: true @@ -53,7 +53,7 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: - - {{ nm.ctl01.nic_mgmt }}{% if nm.vlan_mgmt and nm.vlan_mgmt != 'native' %}.{{ nm.vlan_mgmt }}{% endif %} + - {{ nm.ctl01.nic_mgmt }}{% if nm.vlan_mgmt | int > 0 %}.{{ nm.vlan_mgmt }}{% endif %} noifupdown: true br-ex: enabled: true @@ -62,5 +62,5 @@ parameters: netmask: ${_param:opnfv_net_public_mask} type: bridge use_interfaces: - - {{ nm.ctl01.nic_public }}{% if nm.vlan_public and nm.vlan_public != 'native' %}.{{ nm.vlan_public }}{% endif %} + - {{ nm.ctl01.nic_public }}{% if nm.vlan_public | int > 0 %}.{{ nm.vlan_public }}{% endif %} noifupdown: true diff --git a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 index 48b9a9286..aa8b45f30 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2 @@ -48,7 +48,7 @@ parameters: {%- endfor %} {%- for vlan in vlans %} - {%- if vlan and vlan != 'native' %} + {%- if vlan | int > 0 %} {{ vlans[vlan] }}.{{ vlan }}: enabled: true proto: manual @@ -66,7 +66,7 @@ parameters: address: ${_param:single_address} netmask: 255.255.255.0 use_interfaces: - - {{ nm.cmp001.nic_mgmt }}{% if nm.vlan_mgmt and nm.vlan_mgmt != 'native' %}.{{ nm.vlan_mgmt }}{% endif %} + - {{ nm.cmp001.nic_mgmt }}{% if nm.vlan_mgmt | int > 0 %}.{{ nm.vlan_mgmt }}{% endif %} br-floating: enabled: true type: ovs_bridge @@ -81,7 +81,7 @@ parameters: gateway: ${_param:opnfv_net_public_gw} ovs_port_{{ nm.cmp001.nic_public }}: enabled: true - name: {{ nm.cmp001.nic_public }}{% if nm.vlan_public and nm.vlan_public != 'native' %}.{{ nm.vlan_public }}{% endif %} + name: {{ nm.cmp001.nic_public }}{% if nm.vlan_public | int > 0 %}.{{ nm.vlan_public }}{% endif %} proto: manual ovs_port_type: OVSPort type: ovs_port 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 %} diff --git a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 index 925f895a7..de779bb78 100644 --- a/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2 @@ -24,6 +24,6 @@ parameters: type: dpdk_ovs_bridge address: ${_param:tenant_address} netmask: 255.255.255.0 - {%- if nm.vlan_private and nm.vlan_private != 'native' %} + {%- if nm.vlan_private | int > 0 %} tag: {{ nm.vlan_private }} {%- endif %} 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 4e0f7d147..a3a86723f 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 @@ -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