From a98bf1747db2894394da929d07bde78a1ec19015 Mon Sep 17 00:00:00 2001
From: Szilard Cserey <szilard.cserey@ericsson.com>
Date: Tue, 18 Aug 2015 19:47:50 +0200
Subject: Autodeployer support for ODL Plugin installation + Fuel 6.1

- Opendaylight plugin installation
- Adapting Autodeployer to Fuel 6.1
- restarting blades that couldn't be discovered Fuel in time

BGS-87      Autodeployment restarts blade if that has not been discovered by Fuel
BGS-90      Fuel 6.1 and Opendaylight Fuel plugin install support for Autodeployer

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

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

diff --git a/fuel/deploy/libvirt/networks/fuel1.xml b/fuel/deploy/libvirt/networks/fuel1.xml
deleted file mode 100644
index 7b2b154..0000000
--- a/fuel/deploy/libvirt/networks/fuel1.xml
+++ /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/fuel2.xml b/fuel/deploy/libvirt/networks/fuel2.xml
deleted file mode 100644
index 615c920..0000000
--- a/fuel/deploy/libvirt/networks/fuel2.xml
+++ /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/fuel3.xml b/fuel/deploy/libvirt/networks/fuel3.xml
deleted file mode 100644
index 2383e6c..0000000
--- a/fuel/deploy/libvirt/networks/fuel3.xml
+++ /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/fuel4.xml b/fuel/deploy/libvirt/networks/fuel4.xml
deleted file mode 100644
index 5b69f91..0000000
--- a/fuel/deploy/libvirt/networks/fuel4.xml
+++ /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>
-
-- 
cgit 1.2.3-korg