diff options
17 files changed, 42 insertions, 51 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 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml index 2e3e9d124..33f2804e0 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml @@ -31,8 +31,8 @@ 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:infra_secondary_nic} - single_nic: ${_param:infra_tertiary_nic} + dhcp_nic: ${_param:opnfv_fn_vm_primary_interface} + single_nic: ${_param:opnfv_fn_vm_secondary_interface} linux: network: interface: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml index a84911661..4f8f87a2b 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml @@ -45,8 +45,8 @@ parameters: storage: node: name: default - dhcp_nic: ${_param:infra_primary_nic} - single_nic: ${_param:infra_secondary_nic} + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux_dhcp_interface: enabled: true type: eth diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml index ae2ae4b42..c9b3bc1e0 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml @@ -25,7 +25,7 @@ parameters: cluster_node03_address: ${_param:infra_kvm_node03_address} keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 - deploy_nic: ${_param:openstack_primary_nic} + deploy_nic: ${_param:opnfv_baremetal_primary_nic} salt: control: size: # RAM 4096,8192,16384,32768,65536 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml index 40e23eb8c..260da225d 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml @@ -5,9 +5,9 @@ classes: - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: - dhcp_interface: ${_param:infra_primary_nic} - primary_interface: ${_param:infra_secondary_nic} - pxe_interface: ${_param:infra_tertiary_nic} + 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-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml index 841d2f255..032dd8452 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml @@ -24,9 +24,9 @@ parameters: cluster_node03_hostname: ctl03 cluster_node03_address: ${_param:openstack_control_node03_address} nova_vncproxy_url: https://${_param:cluster_public_host}:6080 - mgmt_nic: ${_param:openstack_primary_nic} - tenant_nic: ${_param:openstack_secondary_nic} - external_nic: ${_param:openstack_tertiary_nic} + mgmt_nic: ${_param:opnfv_baremetal_primary_nic} + tenant_nic: ${_param:opnfv_baremetal_secondary_nic} + external_nic: ${_param:opnfv_baremetal_tertiary_nic} interface_mtu: 1500 keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml index c95c7fe0f..cd7083040 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml @@ -30,8 +30,8 @@ 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:infra_secondary_nic} - single_nic: ${_param:infra_tertiary_nic} + dhcp_nic: ${_param:opnfv_fn_vm_primary_interface} + single_nic: ${_param:opnfv_fn_vm_secondary_interface} linux: network: interface: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml index 4a3ef5ce5..f68d48452 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml @@ -45,8 +45,8 @@ parameters: storage: node: name: default - dhcp_nic: ${_param:infra_primary_nic} - single_nic: ${_param:infra_secondary_nic} + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux_dhcp_interface: enabled: true type: eth diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml index 4b9816bc9..d5f2e92d1 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml @@ -25,7 +25,7 @@ parameters: cluster_node03_address: ${_param:infra_kvm_node03_address} keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 - deploy_nic: ${_param:openstack_primary_nic} + deploy_nic: ${_param:opnfv_baremetal_primary_nic} salt: control: size: # RAM 4096,8192,16384,32768,65536 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml index 7d9cb6493..9c76526a3 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml @@ -5,9 +5,9 @@ classes: - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra parameters: _param: - dhcp_interface: ${_param:infra_primary_nic} - primary_interface: ${_param:infra_secondary_nic} - pxe_interface: ${_param:infra_tertiary_nic} + 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-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml index ca191ad26..e8fc0870f 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml @@ -24,8 +24,8 @@ parameters: cluster_node03_hostname: ctl03 cluster_node03_address: ${_param:openstack_control_node03_address} nova_vncproxy_url: https://${_param:cluster_public_host}:6080 - mgmt_nic: ${_param:openstack_primary_nic} - external_nic: ${_param:openstack_tertiary_nic} + mgmt_nic: ${_param:opnfv_baremetal_primary_nic} + external_nic: ${_param:opnfv_baremetal_tertiary_nic} interface_mtu: 1500 keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml index 98443d97b..75c20f4b4 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml @@ -30,8 +30,8 @@ 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:infra_secondary_nic} - single_nic: ${_param:infra_tertiary_nic} + dhcp_nic: ${_param:opnfv_fn_vm_primary_interface} + single_nic: ${_param:opnfv_fn_vm_secondary_interface} linux: network: interface: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml index 37983049d..7c250a30e 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml @@ -45,8 +45,8 @@ parameters: storage: node: name: default - dhcp_nic: ${_param:infra_primary_nic} - single_nic: ${_param:infra_secondary_nic} + dhcp_nic: ${_param:opnfv_vcp_vm_primary_interface} + single_nic: ${_param:opnfv_vcp_vm_secondary_interface} linux_dhcp_interface: enabled: true type: eth diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml index ab802c6a4..eb73e1cca 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml @@ -25,7 +25,7 @@ parameters: cluster_node03_address: ${_param:infra_kvm_node03_address} keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 - deploy_nic: ${_param:openstack_primary_nic} + deploy_nic: ${_param:opnfv_baremetal_primary_nic} salt: control: size: # RAM 4096,8192,16384,32768,65536 diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml index 7a9172329..1ec662d93 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml @@ -5,9 +5,9 @@ classes: - cluster.baremetal-mcp-ocata-ovs-ha.infra parameters: _param: - dhcp_interface: ${_param:infra_primary_nic} - primary_interface: ${_param:infra_secondary_nic} - pxe_interface: ${_param:infra_tertiary_nic} + 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-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml index 422f65da8..165e0c9c4 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml @@ -23,9 +23,9 @@ parameters: cluster_node03_hostname: ctl03 cluster_node03_address: ${_param:openstack_control_node03_address} nova_vncproxy_url: https://${_param:cluster_public_host}:6080 - mgmt_nic: ${_param:openstack_primary_nic} - tenant_nic: ${_param:openstack_secondary_nic} - external_nic: ${_param:openstack_tertiary_nic} + mgmt_nic: ${_param:opnfv_baremetal_primary_nic} + tenant_nic: ${_param:opnfv_baremetal_secondary_nic} + external_nic: ${_param:opnfv_baremetal_tertiary_nic} linux_system_codename: xenial interface_mtu: 1500 keepalived_vip_interface: br-ctl |