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/net_mcpcontrol.xml.template | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 mcp/scripts/net_mcpcontrol.xml.template

(limited to 'mcp/scripts/net_mcpcontrol.xml.template')

diff --git a/mcp/scripts/net_mcpcontrol.xml.template b/mcp/scripts/net_mcpcontrol.xml.template
deleted file mode 100644
index e0034fd16..000000000
--- a/mcp/scripts/net_mcpcontrol.xml.template
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
- 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>mcpcontrol</name>
-  <bridge name="mcpcontrol"/>
-  <forward mode="nat"/>
-  <ip address="${SALT_MASTER%.*}.1" netmask="255.255.255.0">
-    <dhcp>
-      <range start="${SALT_MASTER%.*}.2" end="${SALT_MASTER%.*}.254"/>
-    </dhcp>
-  </ip>
-</network>
-- 
cgit 1.2.3-korg