Hello, OPNFV installer projects

Firstly, this patchset looks a bit messy at the onset.  relevant
parts are

installers/apex/*.j2
installers/joid/*.j2
installers/compass4nfv/*.j2

and the new verify job that runs check-jinja2.sh

If you look at installers/*/pod_config.yaml.j2 you will see the network
settings for apex joid and compass4nfv installers, the possible to template
hard coded values have been replaced with jinja2 vales, that are populated by
reading one of labs/*/*/config/pod.yaml

eg:
nodes:
  - name: pod1-node1

becomes
  - name: {{ conf['nodes'][0]['name'] }}

In my last patchset I had ignored data already present in the pod.yaml (which is defined in the pharos spec here: https://gerrit.opnfv.org/gerrit/gitweb?p=pharos.git;a=blob;f=config/pod1.yaml )

I created by own yaml file in an attempt to figure out what all the
installers needed to know to install on any given pod.

this was counter productive.

I have included a script (securedlab/check-jinja2.sh)  that will check all

securedlab/installers/*/pod_config.yaml.j2
against all
securedlab/labs/*/pod*.yaml

This is a first step towards having your installers run on any pod that
has a pod file created for it. (securedlab/labs/*/pod[pod-number].yaml)

Moving forward I would like your input on identifing variables in your
installers configs that are needed for deployment but not covered by
securedlab/labs/*/pod*.yaml

Thanks for your time and feedback
Best Regards,
Aric

Change-Id: I5f2f2b403f219a1ec4b35e46a5bc49037a0a89cf
Signed-off-by: agardner <agardner@linuxfoundation.org>

7 files changed, 83 insertions, 262 deletions

diff --git a/labs/ericsson/pod1.yaml b/labs/ericsson/pod1.yaml
index b3afb21..972fccc 100644
--- a/labs/ericsson/pod1.yaml
+++ b/labs/ericsson/pod1.yaml
@@ -28,7 +28,7 @@ jumphost:
   os: ubuntu-16.04
   remote_para: &remoteparas
     type: ipmi
-    version:
+    versions:
       - 1.0
       - 2.0
     user: opnfv
@@ -66,13 +66,13 @@ nodes:
   - name: CI-ERICSSON-POD1-NODE1
     node:
       type: baremetal
-        vendor: HP
-        model: ProLiant BL460c Gen8
-        arch: x86_64
-        cpus: 2
-        cpu_cflags: ivybridge
-        cores: 10
-        memory: 64G
+      vendor: HP
+      model: ProLiant BL460c Gen8
+      arch: x86_64
+      cpus: 2
+      cpu_cflags: ivybridge
+      cores: 10
+      memory: 64G
     disks:                           # for nodes in the same pod may have the same configuration
       - name: 'disk1'
         disk_capacity: 800G
@@ -108,13 +108,13 @@ nodes:
   - name: CI-ERICSSON-POD1-NODE2
     node:
       type: baremetal
-        vendor: HP
-        model: ProLiant BL460c Gen8
-        arch: x86_64
-        cpus: 2
-        cpu_cflags: ivybridge
-        cores: 10
-        memory: 64G
+      vendor: HP
+      model: ProLiant BL460c Gen8
+      arch: x86_64
+      cpus: 2
+      cpu_cflags: ivybridge
+      cores: 10
+      memory: 64G
     disks:                           # for nodes in the same pod may have the same configuration
       - name: 'disk1'
         disk_capacity: 800G
@@ -150,13 +150,13 @@ nodes:
   - name: CI-ERICSSON-POD1-NODE3
     node:
       type: baremetal
-        vendor: HP
-        model: ProLiant BL460c Gen8
-        arch: x86_64
-        cpus: 2
-        cpu_cflags: ivybridge
-        cores: 10
-        memory: 64G
+      vendor: HP
+      model: ProLiant BL460c Gen8
+      arch: x86_64
+      cpus: 2
+      cpu_cflags: ivybridge
+      cores: 10
+      memory: 64G
     disks:                           # for nodes in the same pod may have the same configuration
       - name: 'disk1'
         disk_capacity: 800G
@@ -192,13 +192,13 @@ nodes:
   - name: CI-ERICSSON-POD1-NODE4
     node:
       type: baremetal
-        vendor: HP
-        model: ProLiant BL460c Gen8
-        arch: x86_64
-        cpus: 2
-        cpu_cflags: ivybridge
-        cores: 10
-        memory: 64G
+      vendor: HP
+      model: ProLiant BL460c Gen8
+      arch: x86_64
+      cpus: 2
+      cpu_cflags: ivybridge
+      cores: 10
+      memory: 64G
     disks:                           # for nodes in the same pod may have the same configuration
       - name: 'disk1'
         disk_capacity: 800G
@@ -234,13 +234,13 @@ nodes:
   - name: CI-ERICSSON-POD1-NODE5
     node:
       type: baremetal
-        vendor: HP
-        model: ProLiant BL460c Gen8
-        arch: x86_64
-        cpus: 2
-        cpu_cflags: ivybridge
-        cores: 10
-        memory: 64G
+      vendor: HP
+      model: ProLiant BL460c Gen8
+      arch: x86_64
+      cpus: 2
+      cpu_cflags: ivybridge
+      cores: 10
+      memory: 64G
     disks:                           # for nodes in the same pod may have the same configuration
       - name: 'disk1'
         disk_capacity: 800G
diff --git a/labs/ericsson/pod2.yaml b/labs/ericsson/pod2.yaml
index 8641891..66dabb3 100644
--- a/labs/ericsson/pod2.yaml
+++ b/labs/ericsson/pod2.yaml
@@ -66,14 +66,14 @@ nodes:
   - name: CI-ERICSSON-POD2-NODE1
     node:
       type: baremetal
-        vendor: HP
-        model: ProLiant BL460c Gen9
-        arch: x86_64
-        cpus: 2
-        cpu_cflags: haswell
-        cores: 12
-        memory: 128G
-    disks:                           # for nodes in the same pod may have the same configuration
+      vendor: HP
+      model: ProLiant BL460c Gen9
+      arch: x86_64
+      cpus: 2
+      cpu_cflags: haswell
+      cores: 12
+      memory: 128G
+    disks:  # for nodes in the same pod may have the same configuration
       - name: 'disk1'
         disk_capacity: 1200G
         disk_type: hdd
@@ -108,13 +108,13 @@ nodes:
   - name: CI-ERICSSON-POD2-NODE2
     node:
       type: baremetal
-        vendor: HP
-        model: ProLiant BL460c Gen9
-        arch: x86_64
-        cpus: 2
-        cpu_cflags: haswell
-        cores: 12
-        memory: 128G
+      vendor: HP
+      model: ProLiant BL460c Gen9
+      arch: x86_64
+      cpus: 2
+      cpu_cflags: haswell
+      cores: 12
+      memory: 128G
     disks:                           # for nodes in the same pod may have the same configuration
       - name: 'disk1'
         disk_capacity: 1200G
@@ -150,13 +150,13 @@ nodes:
   - name: CI-ERICSSON-POD2-NODE3
     node:
       type: baremetal
-        vendor: HP
-        model: ProLiant BL460c Gen9
-        arch: x86_64
-        cpus: 2
-        cpu_cflags: haswell
-        cores: 12
-        memory: 128G
+      vendor: HP
+      model: ProLiant BL460c Gen9
+      arch: x86_64
+      cpus: 2
+      cpu_cflags: haswell
+      cores: 12
+      memory: 128G
     disks:                           # for nodes in the same pod may have the same configuration
       - name: 'disk1'
         disk_capacity: 1200G
@@ -192,13 +192,13 @@ nodes:
   - name: CI-ERICSSON-POD2-NODE4
     node:
       type: baremetal
-        vendor: HP
-        model: ProLiant BL460c Gen9
-        arch: x86_64
-        cpus: 2
-        cpu_cflags: haswell
-        cores: 12
-        memory: 128G
+      vendor: HP
+      model: ProLiant BL460c Gen9
+      arch: x86_64
+      cpus: 2
+      cpu_cflags: haswell
+      cores: 12
+      memory: 128G
     disks:                           # for nodes in the same pod may have the same configuration
       - name: 'disk1'
         disk_capacity: 1200G
@@ -234,14 +234,14 @@ nodes:
   - name: CI-ERICSSON-POD2-NODE5
     node:
       type: baremetal
-        vendor: HP
-        model: ProLiant BL460c Gen9
-        arch: x86_64
-        cpus: 2
-        cpu_cflags: haswell
-        cores: 12
-        memory: 128G
-    disks:                           # for nodes in the same pod may have the same configuration
+      vendor: HP
+      model: ProLiant BL460c Gen9
+      arch: x86_64
+      cpus: 2
+      cpu_cflags: haswell
+      cores: 12
+      memory: 128G
+    disks: # for nodes in the same pod may have the same configuration
       - name: 'disk1'
         disk_capacity: 1200G
         disk_type: hdd
diff --git a/labs/intel/pod5.yaml b/labs/intel/pod5.yaml
deleted file mode 100644
index 86077a7..0000000
--- a/labs/intel/pod5.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
----
-### intel pod 5 descriptor file ###
-
-global_details:
-  pod owner:
-  contact:
-  arch: x86_64
-  ipmi_username: "root"
-  ipmi_password: "root"
-  ipmi_ips:
-    - 10.2.117.85
-    - 10.2.117.86
-    - 10.2.117.87
-    - 10.2.117.88
-    - 10.2.117.89
-    - 10.2.117.90
-jumphost:
-  name: ''
-  user: ''
-  pass: ''
-  ip:
-interfaces:
-  - features:
-      - dpdk
-      - sriov
-    mac_addresses:
-      jumphost: "00:25:B5:CC:00:4E"
-      node1: "00:25:B5:CC:00:1E"
-      node2: "00:25:B5:CC:00:5D"
-      node3: "00:25:B5:CC:00:1D"
-      node4: "00:25:B5:CC:00:3C"
-      node5: "00:25:B5:A0:00:5B"
-    networks:
-      - vlan: native
-        cidr: 192.30.9.0/24
-        gateway: 192.30.9.1
-        apex:
-          opnfv_net: admin
-        fuel:
-          opnfv_net: pxe
-        joid:
-          opnfv_net: interal_api
-
-      - vlan: 101
-        cidr: 10.0.1.0/24
-        fuel:
-          opnfv_net: tenant
-          tenant_type: vlan
-
-      - vlan: 102
-        cidr: 10.0.2.0/24
-        fuel:
-          opnfv_net: management
-          tenant_type: vlan
-      - vlan: 103
-        cidr: 10.0.3.0/24
-        fuel:
-          opnfv_net: tenant
-          tenant_type: vlan
-# 10  vlans 5 vlans on the private 2+ nics
-# public, private, admin(pxe), management, storage
diff --git a/labs/lf/pod1/pod.yaml b/labs/lf/pod1/pod.yaml
deleted file mode 100644
index db498c7..0000000
--- a/labs/lf/pod1/pod.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
----
-### LF POD 2 descriptor file ###
-
-global_details:
-  pod owner: Aric Gardner
-  contact: agardner@linuxfoundation.org
-  arch: x86_64
-  ipmi_username: "admin"
-  ipmi_password: "secret"
-  ipmi_ips:
-    - 172.30.8.69
-    - 172.30.8.78
-    - 172.30.8.67
-    - 172.30.8.76
-    - 172.30.8.71
-jumphost:
-  name: 'lf_pod1'
-  user: 'opnfv'
-  pass: 'secret'
-  ip: 172.30.9.66
-
-interfaces:
-  - features:
-      - dpdk
-      - sriov
-    mac_addresses:
-      jumphost: "00:25:B5:CC:00:4E"
-      node1: "00:25:B5:CC:00:1E"
-      node2: "00:25:B5:CC:00:5D"
-      node3: "00:25:B5:CC:00:1D"
-      node4: "00:25:B5:CC:00:3C"
-      node5: "00:25:B5:CC:00:5B"
-      ###
-    mac_addresses2:
-      jumphost: "00:25:B5:CC:00:3F"
-      node1: "00:25:B5:CC:00:0E"
-      node2: "00:25:B5:CC:00:4D"
-      node3: "00:25:B5:CC:00:0D"
-      node4: "00:25:B5:CC:00:2C"
-      node5: "00:25:B5:CC:00:4B"
-    mac_addresses3:
-      jumphost: "00:25:B5:CC:00:2E"
-      node1: "00:25:B5:CC:00:3E"
-      node2: "00:25:B5:CC:00:1F"
-      node3: "00:25:B5:CC:00:3D"
-      node4: "00:25:B5:CC:00:5C"
-      node5: "00:25:B5:CC:00:1C"
-    mac_addressesr4:
-      jumphost: "00:25:B5:CC:00:5E"
-      node1: "00:25:B5:CC:00:4F"
-      node2: "00:25:B5:CC:00:5F"
-      node3: "00:25:B5:CC:00:2D"
-      node4: "00:25:B5:CC:00:4C"
-      node5: "00:25:B5:CC:00:0C"
-      ###
-
-    networks:
-      - vlan: native
-        cidr: 192.30.9.0/24
-        gateway: 192.30.9.1
-        apex:
-          opnfv_net: admin
-        fuel:
-          opnfv_net: pxe
-        joid:
-          opnfv_net: interal_api
-
-      - vlan: 101
-        cidr: 10.0.1.0/24
-        fuel:
-          opnfv_net: tenant
-          tenant_type: vlan
-
-      - vlan: 102
-        cidr: 10.0.2.0/24
-        fuel:
-          opnfv_net: management
-          tenant_type: vlan
-      - vlan: 103
-        cidr: 10.0.3.0/24
-        fuel:
-          opnfv_net: tenant
-          tenant_type: vlan
-  # 10 vlans 5 vlans on the private 2+ nics
-  # public, private, admin(pxe), management, storage
-  - features:
-      - dpdk
-      - sriov
-    mac_addresses:
-      jumphost: "74:4a:a4:00:91:b3"
-      node1: "74:4a:a4:00:91:b3"
-      node2: "74:4a:a4:00:91:b3"
-      node3: "74:4a:a4:00:91:b3"
-      node4: "74:4a:a4:00:91:b3"
-      networks:
-        - vlan: native
-          cidr: 10.1.0.0/24
-          apex:
-            opnfv_net: tenant
-            tenant_type: vxlan
-          fuel:
-            opnfv_net: pxe
-        - vlan: 101
-          cidr: 10.1.1.0/24
-          fuel:
-            opnfv_net: tenant
-            tenant_type: vlan
-        - vlan: 102
-          cidr: 10.1.2.0/24
-          fuel:
-            opnfv_net: management
-            tenant_type: vlan
-        - vlan: 103
-          cidr: 10.1.3.0/24
-          fuel:
-            opnfv_net: tenant
-            tenant_type: vlan
diff --git a/labs/zte/pod1/config/pod.yaml b/labs/zte/pod1.yaml
index e7b5661..cfd406c 100644
--- a/labs/zte/pod1/config/pod.yaml
+++ b/labs/zte/pod1.yaml
@@ -1,5 +1,6 @@
+---
 ### ZTE POD 1 descriptor file ###
-#refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml
+# refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml
 
 details:
   pod owner: Alex Yang
@@ -8,7 +9,6 @@ details:
   location: Shanghai, China
   type: production
   link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab
-
 jumphost:
   name: pod1-jump
   node:
@@ -39,8 +39,8 @@ jumphost:
   os: CentOS-7
   remote_para: &remoteparas
     type: ipmi
-      - ipmi:
-          - 2.0
+    versions:
+      - 2.0
     user: zteroot
     pass: superuser
   interfaces:
@@ -210,7 +210,7 @@ nodes:
     disks: *disks
     remote_mangement:
       <<: *remoteparas
-      address: 192.168.1.103
+      address: 192.168.1.105
       mac_address: "74:4a:a4:00:ce:bf"
     interfaces:
       - name: 'nic1'
@@ -239,4 +239,3 @@ nodes:
         features: dpdk|sriov
         mac_address: "74:4a:a4:00:d6:9c"
         vlan: 163
-
diff --git a/labs/zte/pod2/config/pod.yaml b/labs/zte/pod2.yaml
index b2219f9..4945f99 100644
--- a/labs/zte/pod2/config/pod.yaml
+++ b/labs/zte/pod2.yaml
@@ -35,8 +35,8 @@ jumphost:
   os: CentOS-7
   remote_para: &remoteparas
     type: ipmi
-      - ipmi:
-          - 2.0
+    versions:
+      - 2.0
     user: zteroot
     pass: superuser
   interfaces:
@@ -235,4 +235,3 @@ nodes:
         features: dpdk|sriov
         mac_address: "74:4a:a4:00:d2:c2"
         vlan: 173
-
diff --git a/labs/zte/pod3/config/pod.yaml b/labs/zte/pod3.yaml
index df3bbe0..a17afaf 100644
--- a/labs/zte/pod3/config/pod.yaml
+++ b/labs/zte/pod3.yaml
@@ -39,13 +39,14 @@ jumphost:
   os: CentOS-7
   remote_para: &remoteparas
     type: ipmi
-      - ipmi:
-          - 2.0
+    versions:
+      - 2.0
     user: zteroot
     pass: superuser
   interfaces:
     - nic: 'nic1'
       mac_address: "74:4a:a4:00:21:0c"
+      address:
         - 10.20.0.1
         - 172.10.0.240
         - 192.168.1.4