From 7a464cc994463231bb7d5dfbc9a29bcfcea5bbdb Mon Sep 17 00:00:00 2001 From: Guillermo Herrero Date: Fri, 2 Feb 2018 15:43:56 +0100 Subject: [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 (cherry picked from commit 378b4a72c27c941d5e37216edb23f224fbb58e26) --- .../cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_pdf.yml.j2 | 2 +- .../cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_pdf.yml.j2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_pdf.yml.j2 index d5a424431..519297d27 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-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-ocata-ovs-ha/openstack/compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_pdf.yml.j2 index 18ee09064..519297d27 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute_pdf.yml.j2 +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-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] -%} -- cgit 1.2.3-korg