aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-07 22:40:30 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-07 22:41:50 +0100
commitfac7709ee330362399ddbb2c783f4655ab14442d (patch)
tree3043bd8a96a268a6fd9442ecaf747373e96a5246
parentf78cd791f2529b571152e634aa9141ab993d723e (diff)
[virsh net] Fix virtual node check for public net
Jinja variables set inside loops do not live outside current iteration, so use a dictionary.update to work around that. Fixes: 3d2c66e Change-Id: I2bef64dddab080486a71952465edc4e528ae9e17 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-rw-r--r--mcp/scripts/virsh_net/net_public.xml.j29
1 files changed, 5 insertions, 4 deletions
diff --git a/mcp/scripts/virsh_net/net_public.xml.j2 b/mcp/scripts/virsh_net/net_public.xml.j2
index 37a8d9272..bc9d64dc1 100644
--- a/mcp/scripts/virsh_net/net_public.xml.j2
+++ b/mcp/scripts/virsh_net/net_public.xml.j2
@@ -1,14 +1,15 @@
<!--
- Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+ Copyright (c) 2018 Mirantis Inc., Enea AB and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Apache License, Version 2.0
which accompanies this distribution, and is available at
http://www.apache.org/licenses/LICENSE-2.0
-->
+{%- set cluster = {'has_virtual_nodes': False} %}
{%- for node in conf.nodes %}
- {%- if node.node.type == 'virtual' %}
- {%- set cluster_has_virtual_nodes = True %}
+ {%- if not cluster.has_virtual_nodes and node.node.type == 'virtual' %}
+ {%- set _ = cluster.update({'has_virtual_nodes': True}) %}
{%- endif %}
{%- endfor %}
{%- if conf.idf.net_config.public is defined %}
@@ -21,7 +22,7 @@
<network>
<name>public</name>
<bridge name="public"/>
-{%- if cluster_has_virtual_nodes %}
+{%- if cluster.has_virtual_nodes %}
{#- Ideally, jumpserver would have a real Linux bridge we will hook to.
In case it doesn't, we use this virsh network as a *mock* public.
The *mock* public should NOT overlap with the real public in any way. #}