aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha')
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml6
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml6
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_biport.yml4
-rw-r--r--mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml6
4 files changed, 11 insertions, 11 deletions
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml
index 27424f6b9..4d7fa1eb1 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/config.yml
@@ -38,9 +38,9 @@ parameters:
salt_master_host: ${_param:infra_config_deploy_address}
# yamllint disable rule:line-length
salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
- dhcp_nic: ${_param:opnfv_vm_primary_interface}
- single_nic: ${_param:opnfv_vm_secondary_interface}
- pxe_nic: ${_param:opnfv_vm_tertiary_interface}
+ dhcp_nic: ${_param:opnfv_fn_vm_primary_interface}
+ single_nic: ${_param:opnfv_fn_vm_secondary_interface}
+ pxe_nic: ${_param:opnfv_fn_vm_tertiary_interface}
linux:
network:
interface:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
index 3bf87dca4..da28abf06 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/infra/maas.yml
@@ -12,9 +12,9 @@ classes:
- cluster.baremetal-mcp-pike-common-ha.infra.lab_proxy_pdf
parameters:
_param:
- dhcp_interface: ${_param:opnfv_vm_primary_interface}
- primary_interface: ${_param:opnfv_vm_secondary_interface}
- pxe_interface: ${_param:opnfv_vm_tertiary_interface}
+ dhcp_interface: ${_param:opnfv_fn_vm_primary_interface}
+ primary_interface: ${_param:opnfv_fn_vm_secondary_interface}
+ pxe_interface: ${_param:opnfv_fn_vm_tertiary_interface}
interface_mtu: 1500
# MaaS has issues using MTU > 1500 for PXE interface
pxe_interface_mtu: 1500
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_biport.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_biport.yml
index 9c04ca175..f0fabbafa 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_biport.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_biport.yml
@@ -10,8 +10,8 @@ classes:
- cluster.baremetal-mcp-pike-common-ha.include.proxy
parameters:
_param:
- dhcp_nic: ${_param:opnfv_vm_primary_interface}
- single_nic: ${_param:opnfv_vm_secondary_interface}
+ dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
+ single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
linux:
network:
interface:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml
index 8c07e9156..47f2f76f4 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-pike-common-ha/openstack_interface_vcp_triport.yml
@@ -10,9 +10,9 @@ classes:
- cluster.baremetal-mcp-pike-common-ha.include.proxy
parameters:
_param:
- dhcp_nic: ${_param:opnfv_vm_primary_interface}
- single_nic: ${_param:opnfv_vm_secondary_interface}
- control_nic: ${_param:opnfv_vm_tertiary_interface}
+ dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface}
+ single_nic: ${_param:opnfv_vcp_vm_secondary_interface}
+ control_nic: ${_param:opnfv_vcp_vm_tertiary_interface}
linux:
network:
interface: