diff options
39 files changed, 143 insertions, 100 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 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 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 15202f11b..2e3e9d124 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,11 +31,13 @@ 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} linux: network: interface: - ens3: ${_param:linux_dhcp_interface} - ens4: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} salt: master: accept_policy: open_mode 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 236d521d0..a84911661 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,14 +45,18 @@ parameters: storage: node: name: default + dhcp_nic: ${_param:infra_primary_nic} + single_nic: ${_param:infra_secondary_nic} linux_dhcp_interface: enabled: true type: eth proto: dhcp + name: ${_param:dhcp_nic} linux_single_interface: enabled: true type: eth proto: static + name: ${_param:single_nic} address: ${_param:single_address} netmask: 255.255.255.0 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 67a2c4da5..c13c47514 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: enp6s0 + deploy_nic: ${_param:openstack_primary_nic} salt: control: size: # RAM 4096,8192,16384,32768,65536 @@ -115,10 +115,10 @@ parameters: virt: nic: default: - eth1: + - name: ${_param:deploy_nic} bridge: br-mgmt model: virtio - eth0: + - name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} bridge: br-ctl model: virtio glusterfs: @@ -140,7 +140,7 @@ parameters: linux: network: interface: - eth3: + deploy: enabled: true type: eth proto: manual 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 2e39588f4..40e23eb8c 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: ens3 - primary_interface: ens4 - pxe_interface: ens5 + dhcp_interface: ${_param:infra_primary_nic} + primary_interface: ${_param:infra_secondary_nic} + pxe_interface: ${_param:infra_tertiary_nic} 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/opendaylight/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml index ec25ad1d9..19757076d 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml @@ -10,12 +10,7 @@ parameters: linux: network: interface: - ens3: - enabled: true - type: eth - proto: static - address: ${_param:single_address} - netmask: 255.255.255.0 + single: ${_param:linux_single_interface} opendaylight: server: odl_bind_ip: ${_param:single_address} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml index 160d0bd62..8c7985aba 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml @@ -2,8 +2,11 @@ classes: - cluster.baremetal-mcp-ocata-odl-ha parameters: + _param: + dhcp_nic: eth0 + single_nic: eth1 linux: network: interface: - eth0: ${_param:linux_dhcp_interface} - eth1: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} 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 f2dab3983..841d2f255 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,14 +24,14 @@ parameters: cluster_node03_hostname: ctl03 cluster_node03_address: ${_param:openstack_control_node03_address} nova_vncproxy_url: https://${_param:cluster_public_host}:6080 - mgmt_nic: enp6s0 - tenant_nic: enp7s0 - linux_system_codename: xenial - external_nic: enp8s0 + mgmt_nic: ${_param:openstack_primary_nic} + tenant_nic: ${_param:openstack_secondary_nic} + external_nic: ${_param:openstack_tertiary_nic} interface_mtu: 1500 keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 loopback_device_size: 20 + linux_system_codename: xenial neutron_agents: - neutron-dhcp-agent - neutron-metadata-agent diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml index b04513f12..9da1f03da 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml @@ -23,7 +23,7 @@ classes: - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 50 cluster_vip_address: ${_param:openstack_control_address} cluster_local_address: ${_param:single_address} @@ -37,8 +37,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} keystone: server: cacert: /etc/ssl/certs/mcp_os_cacert diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml index ddcc196ae..e70aab514 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml @@ -8,5 +8,5 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml index 12fbe91d7..fc783d1b4 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml @@ -16,7 +16,7 @@ classes: - cluster.baremetal-mcp-ocata-odl-ha parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 80 galera_server_cluster_name: openstack_cluster galera_max_connections: 3072 @@ -32,5 +32,5 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml index 4bbd92f5e..f740e2904 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml @@ -7,7 +7,7 @@ classes: - cluster.baremetal-mcp-ocata-odl-ha parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 90 cluster_vip_address: ${_param:openstack_message_queue_address} cluster_local_address: ${_param:single_address} @@ -20,5 +20,5 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml index b8d71099a..83a4be3fb 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml @@ -17,7 +17,7 @@ classes: # - cluster.baremetal-mcp-ocata-odl-ha.stacklight.proxy parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 240 nginx_proxy_ssl: enabled: true @@ -29,8 +29,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} system: package: libapache2-mod-wsgi: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml index 8c4d65a62..4b14f7beb 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml @@ -12,7 +12,7 @@ classes: - cluster.baremetal-mcp-ocata-odl-ha.infra parameters: _param: - keepalived_openstack_telemetry_vip_interface: ens3 + keepalived_openstack_telemetry_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 230 cluster_vip_address: ${_param:openstack_telemetry_address} cluster_local_address: ${_param:single_address} @@ -25,8 +25,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} mongodb: server: logging: 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 9d53193be..c95c7fe0f 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,11 +30,13 @@ 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} linux: network: interface: - ens3: ${_param:linux_dhcp_interface} - ens4: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} salt: master: accept_policy: open_mode 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 7d63d773f..4a3ef5ce5 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,14 +45,18 @@ parameters: storage: node: name: default + dhcp_nic: ${_param:infra_primary_nic} + single_nic: ${_param:infra_secondary_nic} linux_dhcp_interface: enabled: true type: eth proto: dhcp + name: ${_param:dhcp_nic} linux_single_interface: enabled: true type: eth proto: static + name: ${_param:single_nic} address: ${_param:single_address} netmask: 255.255.255.0 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 995d1f39b..fedae85c6 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: enp6s0 + deploy_nic: ${_param:openstack_primary_nic} salt: control: size: # RAM 4096,8192,16384,32768,65536 @@ -104,10 +104,10 @@ parameters: virt: nic: default: - eth1: + - name: ${_param:deploy_nic} bridge: br-mgmt model: virtio - eth0: + - name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} bridge: br-ctl model: virtio glusterfs: @@ -129,7 +129,7 @@ parameters: linux: network: interface: - eth3: + deploy: enabled: true type: eth proto: manual 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 db48750d0..7d9cb6493 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: ens3 - primary_interface: ens4 - pxe_interface: ens5 + dhcp_interface: ${_param:infra_primary_nic} + primary_interface: ${_param:infra_secondary_nic} + pxe_interface: ${_param:infra_tertiary_nic} 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/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml index 54fe3d793..ea9f816bd 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml @@ -2,8 +2,11 @@ classes: - cluster.baremetal-mcp-ocata-ovs-dpdk-ha parameters: + _param: + dhcp_nic: eth0 + single_nic: eth1 linux: network: interface: - eth0: ${_param:linux_dhcp_interface} - eth1: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} 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 8db9d13c7..cdf67a030 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,13 +24,13 @@ parameters: cluster_node03_hostname: ctl03 cluster_node03_address: ${_param:openstack_control_node03_address} nova_vncproxy_url: https://${_param:cluster_public_host}:6080 - mgmt_nic: enp6s0 - linux_system_codename: xenial - external_nic: enp8s0 + mgmt_nic: ${_param:openstack_primary_nic} + external_nic: ${_param:openstack_tertiary_nic} interface_mtu: 1500 keepalived_vip_interface: br-ctl keepalived_vip_virtual_router_id: 69 loopback_device_size: 20 + linux_system_codename: xenial neutron: gateway: dpdk: 'True' diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml index d59efa656..1aba5242a 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml @@ -23,7 +23,7 @@ classes: - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 50 cluster_vip_address: ${_param:openstack_control_address} cluster_local_address: ${_param:single_address} @@ -41,8 +41,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} keystone: server: cacert: /etc/ssl/certs/mcp_os_cacert diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml index 9e44d62b1..1b3c5c5a9 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml @@ -8,5 +8,5 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml index d3535eb65..9ecf7e923 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml @@ -16,7 +16,7 @@ classes: - cluster.baremetal-mcp-ocata-ovs-dpdk-ha parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 80 galera_server_cluster_name: openstack_cluster galera_max_connections: 3072 @@ -32,5 +32,5 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml index eac9131bc..ba9e0656f 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml @@ -7,7 +7,7 @@ classes: - cluster.baremetal-mcp-ocata-ovs-dpdk-ha parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 90 cluster_vip_address: ${_param:openstack_message_queue_address} cluster_local_address: ${_param:single_address} @@ -20,5 +20,5 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml index f74373fcc..16c4a0968 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml @@ -17,7 +17,7 @@ classes: # - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.stacklight.proxy parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 240 nginx_proxy_ssl: enabled: true @@ -29,8 +29,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} system: package: libapache2-mod-wsgi: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml index c739b7e92..38267218c 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml @@ -12,7 +12,7 @@ classes: - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra parameters: _param: - keepalived_openstack_telemetry_vip_interface: ens3 + keepalived_openstack_telemetry_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 230 cluster_vip_address: ${_param:openstack_telemetry_address} cluster_local_address: ${_param:single_address} @@ -25,8 +25,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} mongodb: server: logging: 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 3966dae6c..98443d97b 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,11 +30,13 @@ 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} linux: network: interface: - ens3: ${_param:linux_dhcp_interface} - ens4: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} salt: master: accept_policy: open_mode 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 d6c3e6cb1..37983049d 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,14 +45,18 @@ parameters: storage: node: name: default + dhcp_nic: ${_param:infra_primary_nic} + single_nic: ${_param:infra_secondary_nic} linux_dhcp_interface: enabled: true type: eth proto: dhcp + name: ${_param:dhcp_nic} linux_single_interface: enabled: true type: eth proto: static + name: ${_param:single_nic} address: ${_param:single_address} netmask: 255.255.255.0 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 aa3cb4f2a..63fdd7a71 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: enp6s0 + deploy_nic: ${_param:openstack_primary_nic} salt: control: size: # RAM 4096,8192,16384,32768,65536 @@ -105,10 +105,10 @@ parameters: virt: nic: default: - eth1: + - name: ${_param:deploy_nic} bridge: br-mgmt model: virtio - eth0: + - name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan} bridge: br-ctl model: virtio glusterfs: @@ -130,7 +130,7 @@ parameters: linux: network: interface: - eth3: + deploy: enabled: true type: eth proto: manual 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 c0a487417..7a9172329 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: ens3 - primary_interface: ens4 - pxe_interface: ens5 + dhcp_interface: ${_param:infra_primary_nic} + primary_interface: ${_param:infra_secondary_nic} + pxe_interface: ${_param:infra_tertiary_nic} 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/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml index 23a8d46f3..d70f3ed0e 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml @@ -2,8 +2,11 @@ classes: - cluster.baremetal-mcp-ocata-ovs-ha parameters: + _param: + dhcp_nic: eth0 + single_nic: eth1 linux: network: interface: - eth0: ${_param:linux_dhcp_interface} - eth1: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} 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 a6fd289f5..422f65da8 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: enp6s0 - tenant_nic: enp7s0 - external_nic: enp8s0 + mgmt_nic: ${_param:openstack_primary_nic} + tenant_nic: ${_param:openstack_secondary_nic} + external_nic: ${_param:openstack_tertiary_nic} linux_system_codename: xenial interface_mtu: 1500 keepalived_vip_interface: br-ctl diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml index 5d796eb82..3fd4fd185 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml @@ -23,7 +23,7 @@ classes: - cluster.baremetal-mcp-ocata-ovs-ha.infra parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 50 cluster_vip_address: ${_param:openstack_control_address} cluster_local_address: ${_param:single_address} @@ -37,8 +37,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} keystone: server: cacert: /etc/ssl/certs/mcp_os_cacert diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml index f2e010da4..03635ca68 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml @@ -8,5 +8,5 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml index 7346f5545..e2ee1a89c 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml @@ -16,7 +16,7 @@ classes: - cluster.baremetal-mcp-ocata-ovs-ha parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 80 galera_server_cluster_name: openstack_cluster galera_max_connections: 3072 @@ -32,5 +32,5 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml index 083cf7566..67a5d3d5a 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml @@ -7,7 +7,7 @@ classes: - cluster.baremetal-mcp-ocata-ovs-ha parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 90 cluster_vip_address: ${_param:openstack_message_queue_address} cluster_local_address: ${_param:single_address} @@ -20,5 +20,5 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml index 6e0479355..c6a68fa29 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml @@ -17,7 +17,7 @@ classes: # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.proxy parameters: _param: - keepalived_vip_interface: ens3 + keepalived_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 240 nginx_proxy_ssl: enabled: true @@ -29,8 +29,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} system: package: libapache2-mod-wsgi: diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml index 8254d97af..4a72a61e6 100644 --- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml +++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml @@ -12,7 +12,7 @@ classes: - cluster.baremetal-mcp-ocata-ovs-ha.infra parameters: _param: - keepalived_openstack_telemetry_vip_interface: ens3 + keepalived_openstack_telemetry_vip_interface: ${_param:single_nic} keepalived_vip_virtual_router_id: 230 cluster_vip_address: ${_param:openstack_telemetry_address} cluster_local_address: ${_param:single_address} @@ -25,8 +25,8 @@ parameters: linux: network: interface: - ens2: ${_param:linux_dhcp_interface} - ens3: ${_param:linux_single_interface} + dhcp: ${_param:linux_dhcp_interface} + single: ${_param:linux_single_interface} mongodb: server: logging: |