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>

3 files changed, 10 insertions, 11 deletions

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