From 186e1ca5b3ee1b0b76e5d6ddecfee0a94bae45fd Mon Sep 17 00:00:00 2001 From: Guillermo Herrero Date: Tue, 3 Oct 2017 10:30:47 +0200 Subject: Parametrized network config: nic device names Change-Id: I94d40529261f7753ec47a0c6a8c67ecc0fb15951 Signed-off-by: Guillermo Herrero (cherry picked from commit 5ab45d25c8fd3e5528c411e09b105699c745457f) --- .../classes/cluster/all-mcp-ocata-common/aarch64/init.yml | 11 +++++++++++ .../classes/cluster/all-mcp-ocata-common/x86_64/init.yml | 10 ++++++++++ 2 files changed, 21 insertions(+) (limited to 'mcp/reclass/classes/cluster/all-mcp-ocata-common') 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 4fb2adf55..18d39c4aa 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 @@ -14,3 +14,14 @@ 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} + + + 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 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 d7d3945aa..0b66920d0 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 @@ -14,3 +14,13 @@ 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 + + infra_primary_nic: ens3 + infra_secondary_nic: ens4 + infra_tertiary_nic: ens5 + infra_quaternary_nic: ens6 + + openstack_primary_nic: enp6s0 + openstack_secondary_nic: enp7s0 + openstack_tertiary_nic: enp8s0 + openstack_quaternary_nic: enp9s0 -- cgit 1.2.3-korg