[baremetal] idf support for different board types 99/48999/1
authorGuillermo Herrero <guillermo.herrero@enea.com>
Thu, 14 Dec 2017 10:36:35 +0000 (11:36 +0100)
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Thu, 14 Dec 2017 17:23:45 +0000 (18:23 +0100)
This modification enables having different models of target nodes
but restricts them to two groups of the same kind assuming:
 - 3 KVMs will be same model and have the same NIC names
 - 2 Compute nodes will be the same model and have same NIC names

This is an ad-hoc change for arm-pod7. Will work for all other setups
but the jinja2 logic should be evetually extended to support a per
board approach, allowing any board to be any kind

Change-Id: Ie994d661e3dbe5b9a33d290a850a6152cf320c86
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit ee149500e0e6bde0152aa56140046a2d1b995eb4)

mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2

index 687777b..ed52b9a 100644 (file)
@@ -16,7 +16,7 @@
     {%- set idx_public = conf['net_config']['public']['interface'] -%}
 
     {#- Physical interface OS name for each network (e.g. em1, enp1s0f1) -#}
-    {%- set iface_names = conf['idf']['fuel']['network']['node'][0]['interfaces'] -%}
+    {%- set iface_names = conf['idf']['fuel']['network']['node'][3]['interfaces'] -%}
     {%- set nic_admin = iface_names[idx_admin] -%}
     {%- set nic_mgmt = iface_names[idx_mgmt] -%}
     {%- set nic_private = iface_names[idx_private] -%}