From c7e4243cb9ef6111bab4c5421ad7ec09a69e3ce5 Mon Sep 17 00:00:00 2001 From: Guillermo Herrero Date: Mon, 9 Oct 2017 13:56:08 +0200 Subject: Fix parametrized nic name variables -Fix interface order for reclass config node -Interface types regruped on 3 sets for each cpu arch -Foundation VM interface names -VCP VM interface names -Baremetal node interface names Change-Id: I1ae522d775ee538b35b0f043914c80c3993232fc Signed-off-by: Guillermo Herrero (cherry picked from commit c8d0c5b687f5eec9db62171fdf53053f5ffeef28) --- .../classes/cluster/all-mcp-ocata-common/aarch64/init.yml | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64') 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 18d39c4aa..602715070 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 @@ -15,13 +15,8 @@ parameters: opnfv_vcp_vm_primary_interface: ${_param:opnfv_fn_vm_primary_interface} opnfv_vcp_vm_secondary_interface: ${_param:opnfv_fn_vm_secondary_interface} - - infra_primary_nic: enp1s0 - infra_secondary_nic: enp2s0 - infra_tertiary_nic: enp3s0 - infra_quaternary_nic: enp4s0 - - openstack_primary_nic: eth0 - openstack_secondary_nic: eth1 - openstack_tertiary_nic: eth2 - openstack_quaternary_nic: eth3 + # 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 -- cgit 1.2.3-korg