From fac7709ee330362399ddbb2c783f4655ab14442d Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Wed, 7 Feb 2018 22:40:30 +0100
Subject: [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>
---
 mcp/scripts/virsh_net/net_public.xml.j2 | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'mcp/scripts')

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. #}
-- 
cgit 1.2.3-korg