diff options
author | 2018-02-08 20:35:44 +0100 | |
---|---|---|
committer | 2018-03-03 18:48:46 +0100 | |
commit | 1ea4713f79a2c1e7e57da73b3bf86eced559f201 (patch) | |
tree | bdc8712c6b043534287293f5ccde9fd086d41771 /mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm_pdf.yml.j2 | |
parent | 7d810c4b63ec05bb39b1fd6be570623075b6a99d (diff) |
[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 <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm_pdf.yml.j2')
-rw-r--r-- | mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm_pdf.yml.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
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 |