[baremetal] cmp: Support per-node PXE/admin iface

intel-pod18 has different network interfaces on its compute nodes,
requiring support for per-node PXE/admin NIC name override, instead
of assumming all computes use the same NIC naming.

Change-Id: I2b2e5ec6745601576ead898370241b743c963e3d
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>

diff --git a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2 b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
index 9b78bef..3c7fa50 100644 (file)
--- a/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j2
@@ -53,6 +53,7 @@ parameters:
             - cluster.${_param:cluster_name}.openstack.compute
           params:
             pxe_admin_address: {{ nm.net_admin | ipnet_hostaddr(admin) }}
+            pxe_admin_interface: {{ conf.idf.fuel.network.node[i].interfaces[nm.idx_admin] }}
             single_address: {{ nm.net_mgmt | ipnet_hostaddr(mgmt) }}
             tenant_address: {{ nm.net_private | ipnet_hostaddr(pri) }}
             external_address: {{ nm.net_public | ipnet_hostaddr(pub) }}

diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2
index 50de921..3e33811 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j2
@@ -30,7 +30,7 @@ parameters:
         # PXE/admin is always untagged on computes
         pxe_admin_int:
           enabled: true
-          name: {{ nm.cmp001.nic_admin }}
+          name: ${_param:pxe_admin_interface}
           proto: static
           type: eth
           address: ${_param:pxe_admin_address}

diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2
index 20f9b3c..1f45ddf 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j2
@@ -34,7 +34,7 @@ parameters:
       interface:
         pxe_admin_int:
           enabled: true
-          name: {{ nm.cmp001.nic_admin }}
+          name: ${_param:pxe_admin_interface}
           proto: static
           type: eth
           address: ${_param:pxe_admin_address}