[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>

diff --git a/config/installers/apex/pod_config.yaml.j2 b/config/installers/apex/pod_config.yaml.j2
index abb3ddb..b681215 100644 (file)
--- a/config/installers/apex/pod_config.yaml.j2
+++ b/config/installers/apex/pod_config.yaml.j2
@@ -1,3 +1,4 @@
+---
 nodes:
   node1:
     mac_address: "{{ conf['nodes'][0]['remote_management']['mac_address'] }}"

diff --git a/config/installers/compass4nfv/network.yml.j2 b/config/installers/compass4nfv/network.yml.j2
index 2ede083..a98cc4a 100644 (file)
--- a/config/installers/compass4nfv/network.yml.j2
+++ b/config/installers/compass4nfv/network.yml.j2
@@ -23,7 +23,7 @@ provider_net_mappings:
 sys_intf_mappings:
   - name: mgmt
     interface: eth3
-    vlan_tag: {{ conf['nodes'][0]['interfaces'][2]['vlan'] }} #not a good fit
+    vlan_tag: {{ conf['nodes'][0]['interfaces'][2]['vlan'] }}  # not a good fit
     type: vlan
     role:
       - controller
@@ -32,7 +32,7 @@ sys_intf_mappings:
   - name: storage
     interface: eth2
     vlan_tag: 804
-    type: {{ conf['nodes'][0]['interfaces'][1]['vlan'] }} #not a good fit
+    type: {{ conf['nodes'][0]['interfaces'][1]['vlan'] }}  # not a good fit
     role:
       - controller
       - compute

diff --git a/config/installers/compass4nfv/network_ocl.yml.j2 b/config/installers/compass4nfv/network_ocl.yml.j2
index 68144b6..4d1342d 100644 (file)
--- a/config/installers/compass4nfv/network_ocl.yml.j2
+++ b/config/installers/compass4nfv/network_ocl.yml.j2
@@ -23,7 +23,7 @@ provider_net_mappings:
 sys_intf_mappings:
   - name: mgmt
     interface: eth3
-    vlan_tag: {{ conf['nodes'][0]['interfaces'][2]['vlan'] }} #not a good fit
+    vlan_tag: {{ conf['nodes'][0]['interfaces'][2]['vlan'] }}  # not a good fit
     type: vlan
     role:
       - controller

diff --git a/config/installers/compass4nfv/network_onos.yml.j2 b/config/installers/compass4nfv/network_onos.yml.j2
index 017560b..90174c8 100644 (file)
--- a/config/installers/compass4nfv/network_onos.yml.j2
+++ b/config/installers/compass4nfv/network_onos.yml.j2
@@ -23,7 +23,7 @@ provider_net_mappings:
 sys_intf_mappings:
   - name: mgmt
     interface: eth3
-    vlan_tag: {{ conf['nodes'][0]['interfaces'][2]['vlan'] }} #not a good fit
+    vlan_tag: {{ conf['nodes'][0]['interfaces'][2]['vlan'] }}  # not a good fit
     type: vlan
     role:
       - controller
@@ -31,7 +31,7 @@ sys_intf_mappings:
 
   - name: storage
     interface: eth2
-    vlan_tag: {{ conf['nodes'][0]['interfaces'][1]['vlan'] }} #not a good fit
+    vlan_tag: {{ conf['nodes'][0]['interfaces'][1]['vlan'] }}  # not a good fit
     type: vlan
     role:
       - controller

diff --git a/config/installers/compass4nfv/network_openo.yml.j2 b/config/installers/compass4nfv/network_openo.yml.j2
index a8dc016..37b34c7 100644 (file)
--- a/config/installers/compass4nfv/network_openo.yml.j2
+++ b/config/installers/compass4nfv/network_openo.yml.j2
@@ -23,7 +23,7 @@ provider_net_mappings:
 sys_intf_mappings:
   - name: mgmt
     interface: eth3
-    vlan_tag: {{ conf['nodes'][0]['interfaces'][2]['vlan'] }} #not a good fit
+    vlan_tag: {{ conf['nodes'][0]['interfaces'][2]['vlan'] }}  # not a good fit
     type: vlan
     role:
       - controller
@@ -32,7 +32,7 @@ sys_intf_mappings:
   - name: storage
     interface: eth2
     vlan_tag: 804
-    type: {{ conf['nodes'][0]['interfaces'][1]['vlan'] }} #not a good fit
+    type: {{ conf['nodes'][0]['interfaces'][1]['vlan'] }}  # not a good fit
     role:
       - controller
       - compute

diff --git a/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2
index 38b7e26..2dcf048 100644 (file)
--- a/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2
+++ b/config/installers/compass4nfv/os-nosdn-nofeature-ha.yml.j2
@@ -10,7 +10,7 @@
 ---
 TYPE: baremetal
 FLAVOR: cluster
-POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool'  #expects string ipmitool
+POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool'  # expects string ipmitool
 
 ipmiUser: {{ conf['jumphost']['remote_params']['user'] }}
 ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }}
@@ -18,7 +18,7 @@ ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}'
 
 hosts:
   - name: {{ conf['nodes'][0]['name'] }}
-    mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}'
@@ -31,7 +31,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][1]['name'] }}
-    mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}'
@@ -43,7 +43,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][2]['name'] }}
-    mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}'
@@ -55,7 +55,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][3]['name'] }}
-    mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}'
@@ -66,7 +66,7 @@ hosts:
       - ceph-osd
 
   - name: {{ conf['nodes'][4]['name'] }}
-    mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}'

diff --git a/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2 b/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2
index 88823b7..6deb19d 100644 (file)
--- a/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2
+++ b/config/installers/compass4nfv/os-nosdn-openo-ha.yml.j2
@@ -10,7 +10,7 @@
 ---
 TYPE: baremetal
 FLAVOR: cluster
-POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool'  #expects string ipmitool
+POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool'  # expects string ipmitool
 
 ipmiUser: {{ conf['jumphost']['remote_params']['user'] }}
 ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }}
@@ -26,7 +26,7 @@ deploy_options:
 
 hosts:
   - name: {{ conf['nodes'][0]['name'] }}
-    mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}'
@@ -39,7 +39,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][1]['name'] }}
-    mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}'
@@ -51,7 +51,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][2]['name'] }}
-    mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}'
@@ -63,7 +63,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][3]['name'] }}
-    mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}'
@@ -74,7 +74,7 @@ hosts:
       - ceph-osd
 
   - name: {{ conf['nodes'][4]['name'] }}
-    mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}'

diff --git a/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2
index 57c6ad8..d03c7e8 100644 (file)
--- a/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2
+++ b/config/installers/compass4nfv/os-ocl-nofeature-ha.yml.j2
@@ -10,7 +10,7 @@
 ---
 TYPE: baremetal
 FLAVOR: cluster
-POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool'  #expects string ipmitool
+POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool'  # expects string ipmitool
 
 ipmiUser: {{ conf['jumphost']['remote_params']['user'] }}
 ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }}
@@ -18,7 +18,7 @@ ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}'
 
 hosts:
   - name: {{ conf['nodes'][0]['name'] }}
-    mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}'
@@ -32,7 +32,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][1]['name'] }}
-    mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}'
@@ -43,7 +43,7 @@ hosts:
       - ceph-osd
 
   - name: {{ conf['nodes'][2]['name'] }}
-    mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}'
@@ -54,7 +54,7 @@ hosts:
       - ceph-osd
 
   - name: {{ conf['nodes'][3]['name'] }}
-    mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}'
@@ -65,12 +65,12 @@ hosts:
       - ceph-osd
 
   - name: {{ conf['nodes'][4]['name'] }}
-    mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}'
       - eth3: '{{ conf['nodes'][4]['interfaces'][2]['mac_address'] }}'
     ipmiIp: {{ conf['nodes'][4]['remote_management']['address'] }}
-               roles:
+    roles:
       - compute
       - ceph-osd

diff --git a/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2 b/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2
index 7b34802..d3d8aa1 100644 (file)
--- a/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2
+++ b/config/installers/compass4nfv/os-odl_l2-moon-ha.yml.j2
@@ -9,7 +9,7 @@
 ---
 TYPE: baremetal
 FLAVOR: cluster
-POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool'  #expects string ipmitool
+POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool'  # expects string ipmitool
 
 ipmiUser: {{ conf['jumphost']['remote_params']['user'] }}
 ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }}
@@ -17,7 +17,7 @@ ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}'
 
 hosts:
   - name: {{ conf['nodes'][0]['name'] }}
-    mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}'
@@ -31,7 +31,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][1]['name'] }}
-    mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}'
@@ -44,7 +44,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][2]['name'] }}
-    mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}'
@@ -57,7 +57,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][3]['name'] }}
-    mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}'
@@ -68,7 +68,7 @@ hosts:
       - ceph-osd
 
   - name: {{ conf['nodes'][4]['name'] }}
-    mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}'

diff --git a/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2
index 9690b1f..1ba947a 100644 (file)
--- a/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2
+++ b/config/installers/compass4nfv/os-odl_l2-nofeature-ha.yml.j2
@@ -10,7 +10,7 @@
 ---
 TYPE: baremetal
 FLAVOR: cluster
-POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool'  #expects string ipmitool
+POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool'  # expects string ipmitool
 
 ipmiUser: {{ conf['jumphost']['remote_params']['user'] }}
 ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }}
@@ -18,7 +18,7 @@ ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}'
 
 hosts:
   - name: {{ conf['nodes'][0]['name'] }}
-    mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}'
@@ -32,7 +32,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][1]['name'] }}
-    mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}'
@@ -45,7 +45,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][2]['name'] }}
-    mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}'
@@ -58,7 +58,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][3]['name'] }}
-    mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}'
@@ -69,7 +69,7 @@ hosts:
       - ceph-osd
 
   - name: {{ conf['nodes'][4]['name'] }}
-    mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}'

diff --git a/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2
index dfb4d29..d81769c 100644 (file)
--- a/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2
+++ b/config/installers/compass4nfv/os-odl_l3-nofeature-ha.yml.j2
@@ -9,7 +9,7 @@
 ---
 TYPE: baremetal
 FLAVOR: cluster
-POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool'  #expects string ipmitool
+POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool'  # expects string ipmitool
 
 ipmiUser: {{ conf['jumphost']['remote_params']['user'] }}
 ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }}
@@ -19,7 +19,7 @@ odl_l3_agent: "Enable"
 
 hosts:
   - name: {{ conf['nodes'][0]['name'] }}
-    mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}'
@@ -33,7 +33,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][1]['name'] }}
-    mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}'
@@ -46,7 +46,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][2]['name'] }}
-    mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}'
@@ -59,7 +59,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][3]['name'] }}
-    mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}'
@@ -70,7 +70,7 @@ hosts:
       - ceph-osd
 
   - name: {{ conf['nodes'][4]['name'] }}
-    mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}'

diff --git a/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2 b/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2
index 042bb2f..8c731a5 100644 (file)
--- a/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2
+++ b/config/installers/compass4nfv/os-onos-nofeature-ha.yml.j2
@@ -9,7 +9,7 @@
 ---
 TYPE: baremetal
 FLAVOR: cluster
-POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool'  #expects string ipmitool
+POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool'  # expects string ipmitool
 
 ipmiUser: {{ conf['jumphost']['remote_params']['user'] }}
 ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }}
@@ -17,7 +17,7 @@ ipmiVer: '{{ conf['jumphost']['remote_params']['versions'][0] }}'
 
 hosts:
   - name: {{ conf['nodes'][0]['name'] }}
-    mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}'
@@ -31,7 +31,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][1]['name'] }}
-    mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}'
@@ -44,7 +44,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][2]['name'] }}
-    mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}'
@@ -57,7 +57,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][3]['name'] }}
-    mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}'
@@ -68,7 +68,7 @@ hosts:
       - ceph-osd
 
   - name: {{ conf['nodes'][4]['name'] }}
-    mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}'

diff --git a/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2 b/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2
index 746ca36..bbc4723 100644 (file)
--- a/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2
+++ b/config/installers/compass4nfv/os-onos-sfc-ha.yml.j2
@@ -9,7 +9,7 @@
 ---
 TYPE: baremetal
 FLAVOR: cluster
-POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool'  #expects string ipmitool
+POWER_TOOL: '{{ conf['jumphost']['remote_params']['type'] }}tool'  # expects string ipmitool
 
 ipmiUser: {{ conf['jumphost']['remote_params']['user'] }}
 ipmiPass: {{ conf['jumphost']['remote_params']['pass'] }}
@@ -19,7 +19,7 @@ onos_sfc: "Enable"
 
 hosts:
   - name: {{ conf['nodes'][0]['name'] }}
-    mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][0]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}'
@@ -33,7 +33,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][1]['name'] }}
-    mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][1]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}'
@@ -46,7 +46,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][2]['name'] }}
-    mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][2]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}'
@@ -59,7 +59,7 @@ hosts:
       - ceph-mon
 
   - name: {{ conf['nodes'][3]['name'] }}
-    mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][3]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}'
@@ -70,7 +70,7 @@ hosts:
       - ceph-osd
 
   - name: {{ conf['nodes'][4]['name'] }}
-    mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}' #is this the ipmi mac address?
+    mac: '{{ conf['nodes'][4]['remote_management']['mac_address'] }}'  # this is the ipmi mac address
     interfaces:
       - eth1: '{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}'
       - eth2: '{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}'

diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
index 06836e9..bfcec09 100644 (file)
--- a/config/installers/fuel/pod_config.yml.j2
+++ b/config/installers/fuel/pod_config.yml.j2
@@ -1,4 +1,5 @@
-{%- if conf.idf.fuel is defined -%}
+---
+{%- if conf.idf is defined and conf.idf.fuel is defined -%}
   {%- if conf.net_config is defined -%}
       {%- set net_admin = conf.net_config.admin.network -%}
       {%- set net_mgmt = conf.net_config.mgmt.network -%}
@@ -28,8 +29,7 @@
   {%- endif -%}
   {%- if net_public_gw is not defined -%}
       {%- set net_public_gw =  net_public | ipaddr_index('1')  -%}
-  {%- endif -%}
----
+  {%- endif %}
 parameters:
   _param:
 

diff --git a/labs/arm/idf-pod5.yaml b/labs/arm/idf-pod5.yaml
index 52ea6ed..d8a6baf 100644 (file)
--- 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 d21ec92..2db3865 100644 (file)
--- 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 29d9a4e..159401b 100644 (file)
--- 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 14f74d4..9b4a98d 100644 (file)
--- 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 78c916e..c3ad171 100644 (file)
--- 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 e0e4af2..b7d05cf 100644 (file)
--- 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 42e5dda..fc09db3 100644 (file)
--- 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: