aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2018-11-21 15:14:42 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-11-21 15:14:42 +0000
commitba754f2eb858756dd92b3f583442bbff9c991e82 (patch)
treeb9fc217f5c9df26270728ff999babe6f080e41f1
parented525238b75e0cc5dc652dcac4330d02e66a6c8b (diff)
parent24a1cce18edc7108336293771202d576d98e67e2 (diff)
Merge "[baremetal] cmp: Support per-node PXE/admin iface" into stable/gambia
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-arch-common/infra/config_pdf.yml.j21
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_compute_pdf.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_compute_pdf.yml.j22
3 files changed, 3 insertions, 2 deletions
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 9b78bef2c..3c7fa50b8 100644
--- 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 50de921ac..3e33811a9 100644
--- 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 20f9b3c1e..1f45ddf35 100644
--- 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}