From: Guillermo Herrero <guillermo.herrero@enea.com>
Date: Fri, 2 Feb 2018 14:43:56 +0000 (+0100)
Subject: [baremetal] Fix: wrong nic name idf index
X-Git-Tag: opnfv-6.0.0~120^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F97%2F51497%2F1;p=fuel.git

[baremetal] Fix: wrong nic name idf index

This was only affecting pod deployments with
different board models, under the current limited
support:
- 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

For the computes nodes, br-mesh NIC name was wrong due
to incorrect idf mapping

Change-Id: I9685b35cb23b03be9fc0e6fe16c0712a9ad70e19
Signed-off-by: Guillermo Herrero <guillermo.herrero@enea.com>
---

diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
index 7809bd8c8..78a2e8022 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.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 node = conf['idf']['fuel']['network']['node'][1] -%}
+    {%- set node = conf['idf']['fuel']['network']['node'][3] -%}
     {%- set nic_admin = node['interfaces'][idx_admin] -%}
     {%- set nic_mgmt = node['interfaces'][idx_mgmt] -%}
     {%- set nic_private = node['interfaces'][idx_private] -%}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
index 7acb4b4c6..78a2e8022 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.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 node = conf['idf']['fuel']['network']['node'][0] -%}
+    {%- set node = conf['idf']['fuel']['network']['node'][3] -%}
     {%- set nic_admin = node['interfaces'][idx_admin] -%}
     {%- set nic_mgmt = node['interfaces'][idx_mgmt] -%}
     {%- set nic_private = node['interfaces'][idx_private] -%}