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 --- mcp/scripts/pharos | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mcp/scripts/pharos') diff --git a/mcp/scripts/pharos b/mcp/scripts/pharos index fb55d5ab7..31435de50 160000 --- a/mcp/scripts/pharos +++ b/mcp/scripts/pharos @@ -1 +1 @@ -Subproject commit fb55d5ab735d6941ecfea9b0bcfe3a23eb8117ac +Subproject commit 31435de5085f1a5bb9cf965cdbce005fc04781d1 -- cgit 1.2.3-korg