From ff8a684abb229ce0160440291abb0e92604c809e Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Fri, 12 Jan 2018 19:45:21 +0100
Subject: [PDF] Fix yamllint issues in installer adapters

Although current YAML files in Pharos are all valid according to
yamllint, the resulting YAMLs after PDF/IDF + IA interpolations
still have a lot of violations, which need to be addressed.

PDF changes:
- bii/pod1:
  + fix typo in disks_A reference;

IDF changes:
- replace empty strings with `~` keyword (will be expanded to 'None');

IA (installer adapter) changes:
- apex:
  + add missing document start;
- compass4nfv:
  + too few spaces before comment;
  + missing starting space in comment;
  + replace '\t' with spaces;
- daisy:
  + None;
- fuel:
  + check conf.idf is defined first (fix parse for PODs without IDF);
  + move document start outside conf.idf condition
- joid:
  + None;

This is not an exhaustive change, some yamllint issues are still there
but require either refactoring IAs or changing the PDF/IDF files in a
way that needs the respective maintainer's input.

Change-Id: I26743e265217e892b6a94de96a016c295ea24fb5
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
 labs/arm/idf-pod5.yaml      |  2 +-
 labs/arm/idf-pod6.yaml      |  2 +-
 labs/bii/pod1.yaml          |  4 ++--
 labs/ericsson/idf-pod1.yaml |  2 +-
 labs/lf/idf-pod2.yaml       | 16 ++++++++--------
 labs/lf/idf-pod5.yaml       | 16 ++++++++--------
 labs/zte/idf-pod1.yaml      |  2 +-
 7 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'labs')

diff --git a/labs/arm/idf-pod5.yaml b/labs/arm/idf-pod5.yaml
index 52ea6eda..d8a6baf4 100644
--- a/labs/arm/idf-pod5.yaml
+++ b/labs/arm/idf-pod5.yaml
@@ -15,7 +15,7 @@ idf:
       bridges:
         admin: 'admin7_br0'
         mgmt: 'mgmt7_br0'
-        private: ''
+        private: ~
         public: 'public7_br0'
     network:
       node:
diff --git a/labs/arm/idf-pod6.yaml b/labs/arm/idf-pod6.yaml
index d21ec92a..2db3865e 100644
--- a/labs/arm/idf-pod6.yaml
+++ b/labs/arm/idf-pod6.yaml
@@ -15,7 +15,7 @@ idf:
       bridges:
         admin: 'admin14_br0'
         mgmt: 'mgmt14_br0'
-        private: ''
+        private: ~
         public: 'public14_br0'
     network:
       node:
diff --git a/labs/bii/pod1.yaml b/labs/bii/pod1.yaml
index 29d9a4e2..159401b7 100644
--- a/labs/bii/pod1.yaml
+++ b/labs/bii/pod1.yaml
@@ -103,8 +103,8 @@ nodes:
       cpu_cflags: haswell    # add values based on CFLAGS in GCC
       cores: 8               # physical cores, not including hyper-threads
       memory: 32G
-    disks: &disk_A                           # disk list
-      - name: 'disk1'                           # first disk
+    disks: &disks_A                           # disk list
+      - name: 'disk1'                         # first disk
         disk_capacity: 128G                   # volume
         disk_type: ssd                        # several disk types possible
         disk_interface: sas                   # several interface types possible
diff --git a/labs/ericsson/idf-pod1.yaml b/labs/ericsson/idf-pod1.yaml
index 14f74d41..9b4a98d4 100644
--- a/labs/ericsson/idf-pod1.yaml
+++ b/labs/ericsson/idf-pod1.yaml
@@ -15,7 +15,7 @@ idf:
       bridges:
         admin: 'pxebr'
         mgmt: 'br-mgmt'
-        private: ''
+        private: ~
         public: 'br-external'
     network:
       node:
diff --git a/labs/lf/idf-pod2.yaml b/labs/lf/idf-pod2.yaml
index 78c916ef..c3ad1714 100644
--- a/labs/lf/idf-pod2.yaml
+++ b/labs/lf/idf-pod2.yaml
@@ -48,21 +48,21 @@ idf:
   fuel:
     jumphost:
       bridges:
-        admin: ''
-        mgmt: ''
-        private: ''
-        public: ''
+        admin: ~
+        mgmt: ~
+        private: ~
+        public: ~
     network:
       node:
         # Ordered-list, index should be in sync with node index in PDF
         - interfaces: &interfaces
             # Ordered-list, index should be in sync with interface index in PDF
-            - ''
-            - ''
+            - ~
+            - ~
           busaddr: &busaddr
             # Bus-info reported by `ethtool -i ethX`
-            - ''
-            - ''
+            - ~
+            - ~
         - interfaces: *interfaces
           busaddr: *busaddr
         - interfaces: *interfaces
diff --git a/labs/lf/idf-pod5.yaml b/labs/lf/idf-pod5.yaml
index e0e4af28..b7d05cfb 100644
--- a/labs/lf/idf-pod5.yaml
+++ b/labs/lf/idf-pod5.yaml
@@ -45,21 +45,21 @@ idf:
   fuel:
     jumphost:
       bridges:
-        admin: ''
-        mgmt: ''
-        private: ''
-        public: ''
+        admin: ~
+        mgmt: ~
+        private: ~
+        public: ~
     network:
       node:
         # Ordered-list, index should be in sync with node index in PDF
         - interfaces: &interfaces
             # Ordered-list, index should be in sync with interface index in PDF
-            - ''
-            - ''
+            - ~
+            - ~
           busaddr: &busaddr
             # Bus-info reported by `ethtool -i ethX`
-            - ''
-            - ''
+            - ~
+            - ~
         - interfaces: *interfaces
           busaddr: *busaddr
         - interfaces: *interfaces
diff --git a/labs/zte/idf-pod1.yaml b/labs/zte/idf-pod1.yaml
index 42e5dda0..fc09db3f 100644
--- a/labs/zte/idf-pod1.yaml
+++ b/labs/zte/idf-pod1.yaml
@@ -15,7 +15,7 @@ idf:
       bridges:
         admin: 'pxebr'
         mgmt: 'br-mgmt'
-        private: ''
+        private: ~
         public: 'br-external'
     network:
       node:
-- 
cgit 1.2.3-korg