From 2654b0628e30f54b0b8e89208ab04204858cfae5 Mon Sep 17 00:00:00 2001
From: Szilard Cserey <szilard.cserey@ericsson.com>
Date: Thu, 21 May 2015 15:57:35 +0200
Subject: Fuel Config Reap + Additional Refactoring for Autodeployment

1. Refactor the whole autodeployment code in such a way that
the preparation of Fuel VM + networking and the autodeployment itself
can be executed all at once

2. Functionality added that allows reaping of Fuel configuration from
an existing environment and create DHA and DEA configuration files from it

JIRA: [BGS-2] Create Fuel deployment script

Change-Id: I7101295ac4becfc5fa10eda757cec0c2ad127940
Signed-off-by: Szilard Cserey <szilard.cserey@ericsson.com>
---
 fuel/deploy/libvirt/networks/fuel1     | 12 ------------
 fuel/deploy/libvirt/networks/fuel1.xml | 12 ++++++++++++
 fuel/deploy/libvirt/networks/fuel2     |  5 -----
 fuel/deploy/libvirt/networks/fuel2.xml |  5 +++++
 fuel/deploy/libvirt/networks/fuel3     |  5 -----
 fuel/deploy/libvirt/networks/fuel3.xml |  5 +++++
 fuel/deploy/libvirt/networks/fuel4     | 12 ------------
 fuel/deploy/libvirt/networks/fuel4.xml | 12 ++++++++++++
 8 files changed, 34 insertions(+), 34 deletions(-)
 delete mode 100644 fuel/deploy/libvirt/networks/fuel1
 create mode 100644 fuel/deploy/libvirt/networks/fuel1.xml
 delete mode 100644 fuel/deploy/libvirt/networks/fuel2
 create mode 100644 fuel/deploy/libvirt/networks/fuel2.xml
 delete mode 100644 fuel/deploy/libvirt/networks/fuel3
 create mode 100644 fuel/deploy/libvirt/networks/fuel3.xml
 delete mode 100644 fuel/deploy/libvirt/networks/fuel4
 create mode 100644 fuel/deploy/libvirt/networks/fuel4.xml

(limited to 'fuel/deploy/libvirt/networks')

diff --git a/fuel/deploy/libvirt/networks/fuel1 b/fuel/deploy/libvirt/networks/fuel1
deleted file mode 100644
index 7b2b154..0000000
--- a/fuel/deploy/libvirt/networks/fuel1
+++ /dev/null
@@ -1,12 +0,0 @@
-<network>
-  <name>fuel1</name>
-  <forward mode='nat'>
-    <nat>
-      <port start='1024' end='65535'/>
-    </nat>
-  </forward>
-  <bridge name='fuel1' stp='on' delay='0'/>
-  <ip address='10.20.0.1' netmask='255.255.255.0'>
-  </ip>
-</network>
-
diff --git a/fuel/deploy/libvirt/networks/fuel1.xml b/fuel/deploy/libvirt/networks/fuel1.xml
new file mode 100644
index 0000000..7b2b154
--- /dev/null
+++ b/fuel/deploy/libvirt/networks/fuel1.xml
@@ -0,0 +1,12 @@
+<network>
+  <name>fuel1</name>
+  <forward mode='nat'>
+    <nat>
+      <port start='1024' end='65535'/>
+    </nat>
+  </forward>
+  <bridge name='fuel1' stp='on' delay='0'/>
+  <ip address='10.20.0.1' netmask='255.255.255.0'>
+  </ip>
+</network>
+
diff --git a/fuel/deploy/libvirt/networks/fuel2 b/fuel/deploy/libvirt/networks/fuel2
deleted file mode 100644
index 615c920..0000000
--- a/fuel/deploy/libvirt/networks/fuel2
+++ /dev/null
@@ -1,5 +0,0 @@
-<network>
-  <name>fuel2</name>
-  <bridge name='fuel2' stp='on' delay='0'/>
-</network>
-
diff --git a/fuel/deploy/libvirt/networks/fuel2.xml b/fuel/deploy/libvirt/networks/fuel2.xml
new file mode 100644
index 0000000..615c920
--- /dev/null
+++ b/fuel/deploy/libvirt/networks/fuel2.xml
@@ -0,0 +1,5 @@
+<network>
+  <name>fuel2</name>
+  <bridge name='fuel2' stp='on' delay='0'/>
+</network>
+
diff --git a/fuel/deploy/libvirt/networks/fuel3 b/fuel/deploy/libvirt/networks/fuel3
deleted file mode 100644
index 2383e6c..0000000
--- a/fuel/deploy/libvirt/networks/fuel3
+++ /dev/null
@@ -1,5 +0,0 @@
-<network>
-  <name>fuel3</name>
-  <bridge name='fuel3' stp='on' delay='0'/>
-</network>
-
diff --git a/fuel/deploy/libvirt/networks/fuel3.xml b/fuel/deploy/libvirt/networks/fuel3.xml
new file mode 100644
index 0000000..2383e6c
--- /dev/null
+++ b/fuel/deploy/libvirt/networks/fuel3.xml
@@ -0,0 +1,5 @@
+<network>
+  <name>fuel3</name>
+  <bridge name='fuel3' stp='on' delay='0'/>
+</network>
+
diff --git a/fuel/deploy/libvirt/networks/fuel4 b/fuel/deploy/libvirt/networks/fuel4
deleted file mode 100644
index 5b69f91..0000000
--- a/fuel/deploy/libvirt/networks/fuel4
+++ /dev/null
@@ -1,12 +0,0 @@
-<network>
-  <name>fuel4</name>
-  <forward mode='nat'>
-    <nat>
-      <port start='1024' end='65535'/>
-    </nat>
-  </forward>
-  <bridge name='fuel4' stp='on' delay='0'/>
-  <ip address='172.16.0.1' netmask='255.255.255.0'>
-  </ip>
-</network>
-
diff --git a/fuel/deploy/libvirt/networks/fuel4.xml b/fuel/deploy/libvirt/networks/fuel4.xml
new file mode 100644
index 0000000..5b69f91
--- /dev/null
+++ b/fuel/deploy/libvirt/networks/fuel4.xml
@@ -0,0 +1,12 @@
+<network>
+  <name>fuel4</name>
+  <forward mode='nat'>
+    <nat>
+      <port start='1024' end='65535'/>
+    </nat>
+  </forward>
+  <bridge name='fuel4' stp='on' delay='0'/>
+  <ip address='172.16.0.1' netmask='255.255.255.0'>
+  </ip>
+</network>
+
-- 
cgit 1.2.3-korg