summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-06 20:17:36 +0100
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-02-06 20:20:42 +0100
commit3d2c66ead4bdb1179d8ae9b9307c633b9de58298 (patch)
tree6eca3caf102cdfba7fa3266cde2e50127cf16393 /mcp
parent6357d861c2f7c69c1486a40a81d24d7dda66eba8 (diff)
[virsh net] public: rm addr cfg for pure baremetal
To prevent adding a gratuitous requirement on public being a real Linux bridge on the jumpserver when baremetal nodes are present, stop configuring any IP address information for the public virsh network, allowing us to keep mocking it like we did before L3 information was read from IDF. JIRA: FUEL-339 Change-Id: Id09ecac14825a80a0770c5969afad79b0235e08e Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'mcp')
-rw-r--r--mcp/scripts/virsh_net/net_public.xml.j210
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>