summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/classes/cluster/all-mcp-ocata-common
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/reclass/classes/cluster/all-mcp-ocata-common')
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml6
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template1
-rw-r--r--mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml6
3 files changed, 1 insertions, 12 deletions
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml
index 1e5364abd..c698bba5d 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml
@@ -20,9 +20,3 @@ parameters:
# NOTE(armband): Only x86 VCP VMs spawned via salt.control names differ
opnfv_vcp_vm_primary_interface: ${_param:opnfv_fn_vm_primary_interface}
opnfv_vcp_vm_secondary_interface: ${_param:opnfv_fn_vm_secondary_interface}
-
- # Baremetal interface names (target nodes)
- opnfv_baremetal_primary_nic: eth0
- opnfv_baremetal_secondary_nic: eth1
- opnfv_baremetal_tertiary_nic: eth2 # not used in current reclass model
- opnfv_baremetal_quaternary_nic: eth3 # not used in current reclass model
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
index d0c6684b0..cbd47ef80 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/runtime.yml.template
@@ -5,6 +5,7 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
+---
parameters:
_param:
reclass_config_master: ${SALT_MASTER}
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
index a9046db90..13cbbb981 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
@@ -20,9 +20,3 @@ parameters:
# NOTE(armband): Only x86 VCP VMs spawned via salt.control names differ
opnfv_vcp_vm_primary_interface: ens2
opnfv_vcp_vm_secondary_interface: ens3
-
- # Baremetal interface names (target nodes)
- opnfv_baremetal_primary_nic: enp6s0
- opnfv_baremetal_secondary_nic: enp7s0
- opnfv_baremetal_tertiary_nic: enp8s0
- opnfv_baremetal_quaternary_nic: enp9s0 # not used in current reclass model