Merge changes from topic 'fix-public-bridge'

* changes:
  [virtual] Add missing ODL dhcp_int
  [virsh net] public: rm addr cfg for pure baremetal

1 files changed, 10 insertions, 0 deletions

diff --git a/mcp/scripts/virsh_net/net_public.xml.j2 b/mcp/scripts/virsh_net/net_public.xml.j2
index e47f69bb4..37a8d9272 100644
--- a/mcp/scripts/virsh_net/net_public.xml.j2
+++ b/mcp/scripts/virsh_net/net_public.xml.j2
@@ -6,6 +6,11 @@
  which accompanies this distribution, and is available at
  http://www.apache.org/licenses/LICENSE-2.0
 -->
+{%- for node in conf.nodes %}
+  {%- if node.node.type == 'virtual' %}
+    {%- set cluster_has_virtual_nodes = True %}
+  {%- endif %}
+{%- endfor %}
 {%- if conf.idf.net_config.public is defined %}
   {%- set public_network = conf.idf.net_config.public.network %}
   {%- set public_prefix = conf.idf.net_config.public.mask %}
@@ -16,6 +21,11 @@
 <network>
   <name>public</name>
   <bridge name="public"/>
+{%- 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. #}
   <forward mode="nat"/>
   <ip address="{{ public_network | ipaddr_index(1) }}" netmask="{{ public_prefix | netmask }}"/>
+{%- endif %}
 </network>