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>

2 files changed, 167 insertions, 190 deletions

diff --git a/installers/joid/labconfig.jinja2 b/installers/joid/labconfig.jinja2
deleted file mode 100644
index 9e95730..0000000
--- a/installers/joid/labconfig.jinja2
+++ /dev/null
@@ -1,190 +0,0 @@
-lab:
-  location: intel
-  racks:
-  - rack: pod5
-    nodes:
-    - name: rack-5-m1
-      architecture: x86_64
-      roles: [network,control]
-      nics:
-      - ifname: enp4s0f3
-        spaces: [admin]
-        mac: ["00:1E:67:CF:BB:54"]
-      - ifname: ens785f0
-        spaces: [data]
-        mac: ["90:E2:BA:85:4E:2C"]
-      - ifname: ens785f1.504
-        spaces: [public]
-        mac: ["90:E2:BA:85:4E:2D"]
-      - ifname: ens785f0.505
-        spaces: [floating]
-        mac: ["90:E2:BA:85:4E:2C"]
-      - ifname: ens785f1
-        spaces: [storage]
-        mac: ["90:E2:BA:85:4E:2D"]
-      power:
-        type: ipmi
-        address: {{ config['global_details']['ipmi_ips'][0] }}
-        user: root
-        pass: root
-    - name: rack-5-m2
-      architecture: x86_64
-      roles: [compute,control,storage]
-      nics:
-      - ifname: enp4s0f3
-        spaces: [admin]
-        mac: ["00:1E:67:CF:B8:93"]
-      - ifname: ens785f0
-        spaces: [data]
-        mac: ["90:E2:BA:84:08:B8"]
-      - ifname: ens785f1.504
-        spaces: [public]
-        mac: ["90:E2:BA:84:08:B9"]
-      - ifname: ens785f0.505
-        spaces: [floating]
-        mac: ["90:E2:BA:85:4E:2C"]
-      - ifname: ens785f1
-        spaces: [storage]
-        mac: ["90:E2:BA:85:4E:2D"]
-      power:
-        type: ipmi
-        address: {{ config['global_details']['ipmi_ips'][1] }}
-        user: root
-        pass: root
-    - name: rack-5-m3
-      architecture: x86_64
-      roles: [compute,control,storage]
-      nics:
-      - ifname: enp4s0f3
-        spaces: [admin]
-        mac: ["00:1E:67:E0:08:7F"]
-      - ifname: ens785f0
-        spaces: [data]
-        mac: ["90:E2:BA:84:07:0D"]
-      - ifname: ens785f1.504
-        spaces: [public]
-        mac: ["90:E2:BA:84:07:0E"]
-      - ifname: ens785f0.505
-        spaces: [floating]
-        mac: ["90:E2:BA:85:4E:2C"]
-      - ifname: ens785f1
-        spaces: [storage]
-        mac: ["90:E2:BA:85:4E:2D"]
-      power:
-        type: ipmi
-        address: {{ config['global_details']['ipmi_ips'][2] }}
-        user: root
-        pass: root
-    - name: rack-5-m4
-      architecture: x86_64
-      roles: [compute,storage]
-      nics:
-      - ifname: enp4s0f3
-        spaces: [admin]
-        mac: ["00:1E:67:E0:08:B1"]
-      - ifname: ens785f0
-        spaces: [data]
-        mac: ["90:E2:BA:83:FD:80"]
-      - ifname: ens785f1.504
-        spaces: [public]
-        mac: ["90:E2:BA:83:FD:81"]
-      - ifname: ens785f0.505
-        spaces: [floating]
-        mac: ["90:E2:BA:85:4E:2C"]
-      - ifname: ens785f1
-        spaces: [storage]
-        mac: ["90:E2:BA:85:4E:2D"]
-      power:
-        type: ipmi
-        address: {{ config['global_details']['ipmi_ips'][3] }}
-        user: root
-        pass: root
-    - name: rack-5-m5
-      architecture: x86_64
-      roles: [compute,storage]
-      nics:
-      - ifname: enp4s0f3
-        spaces: [admin]
-        mac: ["00:1E:67:E0:0A:4B"]
-      - ifname: ens785f0
-        spaces: [data]
-        mac: ["90:E2:BA:75:22:74"]
-      - ifname: ens785f1.504
-        spaces: [public]
-        mac: ["90:E2:BA:75:22:75"]
-      - ifname: ens785f0.505
-        spaces: [floating]
-        mac: ["90:E2:BA:85:4E:2C"]
-      - ifname: ens785f1
-        spaces: [storage]
-        mac: ["90:E2:BA:85:4E:2D"]
-      power:
-        type: ipmi
-        address: {{ config['global_details']['ipmi_ips'][4] }}
-        user: root
-        pass: root
-#    - name: rack-5-m6
-#      architecture: x86_64
-#      roles: [compute,storage]
-#      nics:
-#      - ifname: enp4s0f3
-#        spaces: [admin]
-#        mac: ["98:4F:EE:10:03:43"]
-#      - ifname: ens785f0
-#        spaces: [data]
-#        mac: ["00:1E:67:9C:3E:54"]
-#      - ifname: ens785f1.504
-#        spaces: [public]
-#        mac: ["00:1E:67:9C:3E:55"]
-#      power:
-#        type: ipmi
-        address: {{ config['global_details']['ipmi_ips'][5] }}
-#        user: root
-#        pass: root
-    floating-ip-range: 10.5.15.6,10.5.15.250,10.5.15.1,10.5.15.0/24
-    ext-port: "ens785f0.505"
-    dns: 8.8.8.8
-    osdomainname:
-opnfv:
-    release: c
-    distro: trusty
-    type: nonha
-    openstack: liberty
-    sdncontroller:
-    - type: nosdn
-    storage:
-    - type: ceph
-      disk: /dev/sdb
-    feature: odl_l2
-    spaces:
-    - type: admin
-      bridge: brAdm
-      cidr: 10.5.1.0/24
-      gateway: 10.5.1.1
-      vlan:
-    - type: data
-      bridge: brData
-      cidr: 10.5.12.0/24
-      gateway:
-      vlan:
-    - type: storage
-      bridge: brStor
-      cidr: 10.5.13.0/24
-      gateway:
-      vlan:
-    - type: public
-      bridge: brMgmt
-      cidr: 10.5.14.0/24
-      gateway:
-      vlan: 504
-    - type: floating
-      bridge: brPublic
-      cidr: 10.5.15.0/24
-      gateway:
-      vlan: 505
-    - type: external
-      bridge: brExt
-      cidr:
-      gateway:
-      ipaddress: 10.2.117.92
-      vlan:
diff --git a/installers/joid/pod_config.yaml.j2 b/installers/joid/pod_config.yaml.j2
new file mode 100644
index 0000000..8e47664
--- /dev/null
+++ b/installers/joid/pod_config.yaml.j2
@@ -0,0 +1,167 @@
+---
+lab:
+  location: intel
+  racks:
+    - rack: pod5
+      nodes:
+    - name: {{ conf['nodes'][0]['name'] }}
+      architecture: {{ conf['nodes'][0]['node']['arch'] }}
+      roles: [network, control]
+      nics:
+        - ifname: {{ conf['nodes'][0]['interfaces'][0]['name'] }}
+          spaces: [data]
+          mac: ["{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][0]['interfaces'][0]['name'] }}.{{ conf['nodes'][0]['interfaces'][0]['vlan'] }}
+          spaces: [floating]
+          mac: ["{{ conf['nodes'][0]['interfaces'][0]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][0]['interfaces'][1]['name'] }}.{{ conf['nodes'][0]['interfaces'][1]['vlan'] }}
+          spaces: [public]
+          mac: ["{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][0]['interfaces'][1]['name'] }}
+          spaces: [storage]
+          mac: ["{{ conf['nodes'][0]['interfaces'][1]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][0]['interfaces'][2]['name'] }}
+          spaces: [admin]
+          mac: ["{{ conf['nodes'][0]['interfaces'][2]['mac_address'] }}"]
+      power:
+        type: {{ conf['jumphost']['remote_para']['type'] }}
+        address: {{ conf['nodes'][0]['remote_mangement']['address'] }}
+        user: {{ conf['jumphost']['remote_para']['user'] }}
+        pass: {{ conf['jumphost']['remote_para']['pass'] }}
+    - name: {{ conf['nodes'][1]['name'] }}
+      architecture: {{ conf['nodes'][1]['node']['arch'] }}
+      roles: [compute, control, storage]
+      nics:
+        - ifname: {{ conf['nodes'][1]['interfaces'][0]['name'] }}
+          spaces: [data]
+          mac: ["{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][1]['interfaces'][0]['name'] }}.{{ conf['nodes'][1]['interfaces'][0]['vlan'] }}
+          spaces: [floating]
+          mac: ["{{ conf['nodes'][1]['interfaces'][0]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][1]['interfaces'][1]['name'] }}.{{ conf['nodes'][1]['interfaces'][1]['vlan'] }}
+          spaces: [public]
+          mac: ["{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][1]['interfaces'][1]['name'] }}
+          spaces: [storage]
+          mac: ["{{ conf['nodes'][1]['interfaces'][1]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][1]['interfaces'][2]['name'] }}
+          spaces: [admin]
+          mac: ["{{ conf['nodes'][1]['interfaces'][2]['mac_address'] }}"]
+      power:
+        type: {{ conf['jumphost']['remote_para']['type'] }}
+        address: {{ conf['nodes'][1]['remote_mangement']['address'] }}
+        user: {{ conf['jumphost']['remote_para']['user'] }}
+        pass: {{ conf['jumphost']['remote_para']['pass'] }}
+    - name: {{ conf['nodes'][2]['name'] }}
+      architecture: {{ conf['nodes'][2]['node']['arch'] }}
+      roles: [compute, control, storage]
+      nics:
+        - ifname: {{ conf['nodes'][2]['interfaces'][0]['name'] }}
+          spaces: [data]
+          mac: ["{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][2]['interfaces'][0]['name'] }}.{{ conf['nodes'][2]['interfaces'][0]['vlan'] }}
+          spaces: [floating]
+          mac: ["{{ conf['nodes'][2]['interfaces'][0]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][2]['interfaces'][1]['name'] }}.{{ conf['nodes'][2]['interfaces'][1]['vlan'] }}
+          spaces: [public]
+          mac: ["{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][2]['interfaces'][1]['name'] }}
+          spaces: [storage]
+          mac: ["{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][2]['interfaces'][2]['name'] }}
+      power:
+        type: {{ conf['jumphost']['remote_para']['type'] }}
+        address: {{ conf['nodes'][2]['remote_mangement']['address'] }}
+        user: {{ conf['jumphost']['remote_para']['user'] }}
+        pass: {{ conf['jumphost']['remote_para']['pass'] }}
+    - name: {{ conf['nodes'][3]['name'] }}
+      architecture: {{ conf['nodes'][3]['node']['arch'] }}
+      roles: [compute, storage]
+      nics:
+        - ifname: {{ conf['nodes'][3]['interfaces'][0]['name'] }}
+          spaces: [data]
+          mac: ["{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][3]['interfaces'][0]['name'] }}.{{ conf['nodes'][3]['interfaces'][0]['vlan'] }}
+          spaces: [floating]
+          mac: ["{{ conf['nodes'][3]['interfaces'][0]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][3]['interfaces'][1]['name'] }}.{{ conf['nodes'][3]['interfaces'][1]['vlan'] }}
+          spaces: [public]
+          mac: ["{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][3]['interfaces'][1]['name'] }}
+          spaces: [storage]
+          mac: ["{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][3]['interfaces'][2]['name'] }}
+      power:
+        type: ipmi
+        address: {{ conf['nodes'][3]['remote_mangement']['address'] }}
+        user: {{ conf['jumphost']['remote_para']['user'] }}
+        pass: {{ conf['jumphost']['remote_para']['pass'] }}
+    - name: {{ conf['nodes'][4]['name'] }}
+      architecture: {{ conf['nodes'][4]['node']['arch'] }}
+      roles: [compute, storage]
+      nics:
+        - ifname: {{ conf['nodes'][4]['interfaces'][0]['name'] }}
+          spaces: [data]
+          mac: ["{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][4]['interfaces'][0]['name'] }}.{{ conf['nodes'][4]['interfaces'][0]['vlan'] }}
+          spaces: [floating]
+          mac: ["{{ conf['nodes'][4]['interfaces'][0]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][4]['interfaces'][1]['name'] }}.{{ conf['nodes'][4]['interfaces'][1]['vlan'] }}
+          spaces: [public]
+          mac: ["{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][4]['interfaces'][1]['name'] }}
+          spaces: [storage]
+          mac: ["{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}"]
+        - ifname: {{ conf['nodes'][1]['interfaces'][2]['name'] }}
+      power:
+        type: {{ conf['jumphost']['remote_para']['type'] }}
+        address: {{ conf['nodes'][4]['remote_mangement']['address'] }}
+        user: {{ conf['jumphost']['remote_para']['user'] }}
+        pass: {{ conf['jumphost']['remote_para']['pass'] }}
+      floating-ip-range: 10.5.15.6,10.5.15.250,10.5.15.1,10.5.15.0/24
+      ext-port: "ens785f0.505"
+      dns: 8.8.8.8
+      osdomainname:
+opnfv:
+  release: c
+  distro: trusty
+  type: nonha
+  openstack: liberty
+  sdncontroller:
+    - type: nosdn
+  storage:
+    - type: ceph
+      disk: /dev/sdb
+  feature: odl_l2
+  spaces:
+    - type: admin
+      bridge: brAdm
+      cidr: 10.5.1.0/24
+      gateway: 10.5.1.1
+      vlan:
+    - type: data
+      bridge: brData
+      cidr: 10.5.12.0/24
+      gateway:
+      vlan:
+    - type: storage
+      bridge: brStor
+      cidr: 10.5.13.0/24
+      gateway:
+      vlan:
+    - type: public
+      bridge: brMgmt
+      cidr: 10.5.14.0/24
+      gateway:
+      vlan: 504
+    - type: floating
+      bridge: brPublic
+      cidr: 10.5.15.0/24
+      gateway:
+      vlan: 505
+    - type: external
+      bridge: brExt
+      cidr:
+      gateway:
+      ipaddress: 10.2.117.92
+      vlan: