From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Sat, 3 Feb 2018 16:43:08 +0000 (+0000)
Subject: Merge "[baremetal] Fix: wrong nic name idf index"
X-Git-Tag: opnfv-6.0.0~120
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=cbc651f281c280fab346b044a2a41083f3ff9468;p=fuel.git

Merge "[baremetal] Fix: wrong nic name idf index"
---

cbc651f281c280fab346b044a2a41083f3ff9468
diff --cc mcp/reclass/classes/cluster/baremetal-mcp-pike-odl-ha/openstack/compute_pdf.yml.j2
index 52090cc0a,78a2e8022..f371c1d0d
--- 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
@@@ -10,13 -10,13 +10,13 @@@
      {#- NOTE: Currently, we assume all cluster nodes use the same mapping -#}
  
      {#- Determine interface index for each network (plumbing vars) -#}
 -    {%- set idx_admin = conf['net_config']['admin']['interface'] -%}
 -    {%- set idx_mgmt = conf['net_config']['mgmt']['interface'] -%}
 -    {%- set idx_private = conf['net_config']['private']['interface'] -%}
 -    {%- set idx_public = conf['net_config']['public']['interface'] -%}
 +    {%- set idx_admin = conf['idf']['net_config']['admin']['interface'] -%}
 +    {%- set idx_mgmt = conf['idf']['net_config']['mgmt']['interface'] -%}
 +    {%- set idx_private = conf['idf']['net_config']['private']['interface'] -%}
 +    {%- set idx_public = conf['idf']['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 --cc mcp/reclass/classes/cluster/baremetal-mcp-pike-ovs-ha/openstack/compute_pdf.yml.j2
index 7b90c727a,78a2e8022..f371c1d0d
--- 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
@@@ -10,13 -10,13 +10,13 @@@
      {#- NOTE: Currently, we assume all cluster nodes use the same mapping -#}
  
      {#- Determine interface index for each network (plumbing vars) -#}
 -    {%- set idx_admin = conf['net_config']['admin']['interface'] -%}
 -    {%- set idx_mgmt = conf['net_config']['mgmt']['interface'] -%}
 -    {%- set idx_private = conf['net_config']['private']['interface'] -%}
 -    {%- set idx_public = conf['net_config']['public']['interface'] -%}
 +    {%- set idx_admin = conf['idf']['net_config']['admin']['interface'] -%}
 +    {%- set idx_mgmt = conf['idf']['net_config']['mgmt']['interface'] -%}
 +    {%- set idx_private = conf['idf']['net_config']['private']['interface'] -%}
 +    {%- set idx_public = conf['idf']['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] -%}