[j2 parsing] Adopt new generate_config features 17/53017/5
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Thu, 8 Feb 2018 19:35:44 +0000 (20:35 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Sat, 3 Mar 2018 17:48:46 +0000 (18:48 +0100)
commit1ea4713f79a2c1e7e57da73b3bf86eced559f201
treebdc8712c6b043534287293f5ccde9fd086d41771
parent7d810c4b63ec05bb39b1fd6be570623075b6a99d
[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>
mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2
mcp/reclass/classes/cluster/mcp-pike-common-ha/infra/kvm_pdf.yml.j2
mcp/reclass/classes/cluster/mcp-pike-common-ha/openstack_compute_pdf.yml.j2
mcp/reclass/classes/cluster/mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
mcp/reclass/classes/cluster/mcp-pike-ovs-dpdk-ha/openstack/compute_pdf.yml.j2
mcp/reclass/classes/cluster/mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
mcp/scripts/lib.sh
mcp/scripts/pharos
mcp/scripts/virsh_net/net_public.xml.j2