From 058c64ae668191ca8223afa581c7b3214b52fe4a Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Fri, 26 Jan 2018 21:59:28 +0100
Subject: [PDF] Switch to generate_config, unify templates

- move bash template handling (previously expanded via `envsubst`)
  to lib.sh;
- move j2 template handling to lib.sh;
- move virsh network templates to 'mcp/scripts/virsh_net' subdir;
- switch virsh network templates from `envsubst` expansion to j2 and
  leverage generate_config.py, similar to PDF Fuel installer adapter;
- add relevant runtime env vars (e.g. SALT_MASTER, MAAS_IP) on the fly
  to PDF, to consume them in templates like params coming from PDF;
- parameterize virsh network definitions based on PDF (mgmt, public);

JIRA: FUEL-322

Change-Id: Ib94e78fc4f25797b9354a0552e884104da5d0003
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 mcp/scripts/virsh_net/net_internal.xml      | 12 ++++++++++++
 mcp/scripts/virsh_net/net_mcpcontrol.xml.j2 | 19 +++++++++++++++++++
 mcp/scripts/virsh_net/net_mgmt.xml.j2       | 20 ++++++++++++++++++++
 mcp/scripts/virsh_net/net_public.xml.j2     | 21 +++++++++++++++++++++
 4 files changed, 72 insertions(+)
 create mode 100644 mcp/scripts/virsh_net/net_internal.xml
 create mode 100644 mcp/scripts/virsh_net/net_mcpcontrol.xml.j2
 create mode 100644 mcp/scripts/virsh_net/net_mgmt.xml.j2
 create mode 100644 mcp/scripts/virsh_net/net_public.xml.j2

(limited to 'mcp/scripts/virsh_net')

diff --git a/mcp/scripts/virsh_net/net_internal.xml b/mcp/scripts/virsh_net/net_internal.xml
new file mode 100644
index 000000000..8cf875e7c
--- /dev/null
+++ b/mcp/scripts/virsh_net/net_internal.xml
@@ -0,0 +1,12 @@
+<!--
+ Copyright (c) 2017 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
+-->
+<network>
+  <name>internal</name>
+  <bridge name="internal"/>
+</network>
diff --git a/mcp/scripts/virsh_net/net_mcpcontrol.xml.j2 b/mcp/scripts/virsh_net/net_mcpcontrol.xml.j2
new file mode 100644
index 000000000..95424db4e
--- /dev/null
+++ b/mcp/scripts/virsh_net/net_mcpcontrol.xml.j2
@@ -0,0 +1,19 @@
+<!--
+ Copyright (c) 2017 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
+-->
+{#- conf.MCPCONTROL_NET & co are mandatory, defaults are set via globals.sh #}
+<network>
+  <name>mcpcontrol</name>
+  <bridge name="mcpcontrol"/>
+  <forward mode="nat"/>
+  <ip address="{{ conf.MCPCONTROL_NET | ipaddr_index(1) }}" netmask="{{ conf.MCPCONTROL_PREFIX | netmask }}">
+    <dhcp>
+      <range start="{{ conf.MCPCONTROL_NET | ipaddr_index(2) }}" end="{{ conf.MCPCONTROL_NET | ipaddr_index(254) }}"/>
+    </dhcp>
+  </ip>
+</network>
diff --git a/mcp/scripts/virsh_net/net_mgmt.xml.j2 b/mcp/scripts/virsh_net/net_mgmt.xml.j2
new file mode 100644
index 000000000..a558293fa
--- /dev/null
+++ b/mcp/scripts/virsh_net/net_mgmt.xml.j2
@@ -0,0 +1,20 @@
+<!--
+ Copyright (c) 2017 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
+-->
+{%- if conf.idf.net_config.mgmt is defined %}
+  {%- set mgmt_network = conf.idf.net_config.mgmt.network %}
+  {%- set mgmt_prefix = conf.idf.net_config.mgmt.mask %}
+{%- else %}
+  {%- set mgmt_network = '172.16.10.0' %}
+  {%- set mgmt_prefix = '24' %}
+{%- endif %}
+<network>
+  <name>mgmt</name>
+  <bridge name="mgmt"/>
+  <ip address="{{ mgmt_network | ipaddr_index(1) }}" netmask="{{ mgmt_prefix | netmask }}"/>
+</network>
diff --git a/mcp/scripts/virsh_net/net_public.xml.j2 b/mcp/scripts/virsh_net/net_public.xml.j2
new file mode 100644
index 000000000..e47f69bb4
--- /dev/null
+++ b/mcp/scripts/virsh_net/net_public.xml.j2
@@ -0,0 +1,21 @@
+<!--
+ Copyright (c) 2017 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
+-->
+{%- 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 %}
+{%- else %}
+  {%- set public_network = '10.16.0.0' %}
+  {%- set public_prefix = '24' %}
+{%- endif %}
+<network>
+  <name>public</name>
+  <bridge name="public"/>
+  <forward mode="nat"/>
+  <ip address="{{ public_network | ipaddr_index(1) }}" netmask="{{ public_prefix | netmask }}"/>
+</network>
-- 
cgit 1.2.3-korg