diff options
| author |   Guillermo Herrero <guillermo.herrero@enea.com> | 2017-10-09 13:56:08 +0200 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-10-11 17:55:38 +0000 |
| commit | c7e4243cb9ef6111bab4c5421ad7ec09a69e3ce5 (patch) | |
| tree | 8d78e5355f62a2f975efb3ec9a861028fd1df199 /mcp/reclass/classes/cluster/all-mcp-ocata-common | |
| parent | 0f26e101fd010ed9cd17af3174f3cb2f45d6a5f1 (diff) | |
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 <guillermo.herrero@enea.com>
(cherry picked from commit c8d0c5b687f5eec9db62171fdf53053f5ffeef28)
Diffstat (limited to 'mcp/reclass/classes/cluster/all-mcp-ocata-common')
| -rw-r--r-- | mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml | 15 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml | 14 |
2 files changed, 10 insertions, 19 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 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 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 0b66920d0..218104045 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 @@ -15,12 +15,8 @@ parameters: 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 + # 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 |