From 14fe92acb1006cdb01ff57a588683b5bb2f15d47 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Tue, 3 Oct 2017 18:38:00 +0200
Subject: lf-pod2, arm-pod5: Fuel Installer Descriptor File

While at it, quote string variables in ericsson-pod1 IDF.

Now that we can determine bridge names from IDF, drop legacy
"local_env" mechanism for baremetal PODs.

Change-Id: I1db41cde503099352adb72d0969c1dd0f8a92a59
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 labs/arm/idf-pod5.yaml              | 12 ++++++++++++
 labs/arm/pod5/fuel/config/local_env |  2 --
 labs/ericsson/idf-pod1.yaml         |  8 ++++----
 labs/lf/idf-pod2.yaml               | 12 ++++++++++++
 labs/lf/pod2/fuel/config/local_env  |  1 -
 5 files changed, 28 insertions(+), 7 deletions(-)
 create mode 100644 labs/arm/idf-pod5.yaml
 delete mode 100644 labs/arm/pod5/fuel/config/local_env
 create mode 100644 labs/lf/idf-pod2.yaml
 delete mode 100644 labs/lf/pod2/fuel/config/local_env

diff --git a/labs/arm/idf-pod5.yaml b/labs/arm/idf-pod5.yaml
new file mode 100644
index 0000000..bf49c0d
--- /dev/null
+++ b/labs/arm/idf-pod5.yaml
@@ -0,0 +1,12 @@
+---
+### ARM POD 5 installer descriptor file ###
+
+idf:
+  version: 0.1
+  fuel:
+    jumphost:
+      bridges:
+        admin: 'admin7_br0'
+        mgmt: 'mgmt7_br0'
+        private: ''
+        public: 'public7_br0'
diff --git a/labs/arm/pod5/fuel/config/local_env b/labs/arm/pod5/fuel/config/local_env
deleted file mode 100644
index d5e4dec..0000000
--- a/labs/arm/pod5/fuel/config/local_env
+++ /dev/null
@@ -1,2 +0,0 @@
-export LIBVIRT_DEFAULT_URI="qemu:///system"
-export DEFAULT_BRIDGE=admin7_br0,mgmt7_br0,,public7_br0
diff --git a/labs/ericsson/idf-pod1.yaml b/labs/ericsson/idf-pod1.yaml
index 10469d2..1c9f297 100644
--- a/labs/ericsson/idf-pod1.yaml
+++ b/labs/ericsson/idf-pod1.yaml
@@ -6,7 +6,7 @@ idf:
   fuel:
     jumphost:
       bridges:
-        admin: pxebr
-        mgmt: br-mgmt
-        private:
-        public: br-external
+        admin: 'pxebr'
+        mgmt: 'br-mgmt'
+        private: ''
+        public: 'br-external'
diff --git a/labs/lf/idf-pod2.yaml b/labs/lf/idf-pod2.yaml
new file mode 100644
index 0000000..7932f88
--- /dev/null
+++ b/labs/lf/idf-pod2.yaml
@@ -0,0 +1,12 @@
+---
+### LF POD 2 installer descriptor file ###
+
+idf:
+  version: 0.1
+  fuel:
+    jumphost:
+      bridges:
+        admin: 'pxebr'
+        mgmt: 'br-ctl'
+        private: ''
+        public: ''
diff --git a/labs/lf/pod2/fuel/config/local_env b/labs/lf/pod2/fuel/config/local_env
deleted file mode 100644
index 5d587a2..0000000
--- a/labs/lf/pod2/fuel/config/local_env
+++ /dev/null
@@ -1 +0,0 @@
-export DEFAULT_BRIDGE=pxebr,br-ctl
-- 
cgit 1.2.3-korg