From 0c309662686fe1ccc7bf3c09f177f6c6ebd7525b Mon Sep 17 00:00:00 2001 From: Guillermo Herrero Date: Thu, 14 Dec 2017 11:36:35 +0100 Subject: [baremetal] idf support for different board types 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 Signed-off-by: Alexandru Avadanii (cherry picked from commit ee149500e0e6bde0152aa56140046a2d1b995eb4) --- .../cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 index 687777b2c..ed52b9a93 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/openstack_compute_init.yml.j2 @@ -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] -%} -- cgit 1.2.3-korg