diff options
author | 2018-02-08 20:35:44 +0100 | |
---|---|---|
committer | 2018-03-03 18:48:46 +0100 | |
commit | 1ea4713f79a2c1e7e57da73b3bf86eced559f201 (patch) | |
tree | bdc8712c6b043534287293f5ccde9fd086d41771 /mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.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/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2')
-rw-r--r-- | mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 b/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 index 2dfea5f60..8a366e9f9 100644 --- a/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 +++ b/mcp/config/scenario/os-nosdn-nofeature-novcp-ha.yaml.j2 @@ -9,7 +9,7 @@ {%- set cluster = {'has_virtual_nodes': False} %} {%- for node in conf.nodes %} {%- if not cluster.has_virtual_nodes and node.node.type == 'baremetal' %} - {%- set _ = cluster.update({'has_baremetal_nodes': True}) %} + {%- do cluster.update({'has_baremetal_nodes': True}) %} {%- endif %} {%- endfor %} --- |