diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-12 19:45:21 +0100 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2018-01-14 18:02:30 +0100 |
commit | ff8a684abb229ce0160440291abb0e92604c809e (patch) | |
tree | c3005b4c179a6e0395529579cad5351f57563176 /labs | |
parent | 90e2b5ea413edb1f12d0f6fbcc58e7c68b2aaa57 (diff) |
[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>
Diffstat (limited to 'labs')
-rw-r--r-- | labs/arm/idf-pod5.yaml | 2 | ||||
-rw-r--r-- | labs/arm/idf-pod6.yaml | 2 | ||||
-rw-r--r-- | labs/bii/pod1.yaml | 4 | ||||
-rw-r--r-- | labs/ericsson/idf-pod1.yaml | 2 | ||||
-rw-r--r-- | labs/lf/idf-pod2.yaml | 16 | ||||
-rw-r--r-- | labs/lf/idf-pod5.yaml | 16 | ||||
-rw-r--r-- | labs/zte/idf-pod1.yaml | 2 |
7 files changed, 22 insertions, 22 deletions
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: |