From 957a0c3538805c05c3cba209b9800bb43202e620 Mon Sep 17 00:00:00 2001 From: Rihab Banday Date: Tue, 9 Mar 2021 15:26:54 +0100 Subject: Updated PDF and IDF for Ericsson Hardware This change updates the config files for Ericsson POD 1 and removes existing Ericsson POD 2 configuration based on recent hardware and software updates. Change-Id: I4d26be681b4d805029e5de9c91f96a7634974990 Signed-off-by: Rihab Banday Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/72149 Tested-by: jenkins-ci Reviewed-by: Georg Kunz Reviewed-by: Michael Pedersen --- hw_config/ericsson-pod1/idf.yaml | 52 +++++++++++++++-- hw_config/ericsson-pod1/pdf.yaml | 121 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 165 insertions(+), 8 deletions(-) (limited to 'hw_config/ericsson-pod1') diff --git a/hw_config/ericsson-pod1/idf.yaml b/hw_config/ericsson-pod1/idf.yaml index e3da857..a160e0a 100644 --- a/hw_config/ericsson-pod1/idf.yaml +++ b/hw_config/ericsson-pod1/idf.yaml @@ -18,7 +18,6 @@ idf: gateway: 10.0.20.1 mask: 24 dns: - - 192.168.1.200 - 8.8.8.8 public: interface: 1 @@ -27,19 +26,24 @@ idf: gateway: 100.64.200.1 mask: 24 dns: - - 192.168.1.200 - 8.8.8.8 kubespray: &idf_kubespray nodes_roles: node1: [k8s-cluster, kube-master, etcd, vault] - node2: [k8s-cluster, kube-node] + node2: [k8s-cluster, kube-master, etcd] + node3: [k8s-cluster, kube-master, etcd] + node4: [k8s-cluster, kube-node] + node5: [k8s-cluster, kube-node] groups: k8s-cluster: - kube-node - kube-master hostnames: node1: master1 - node2: node1 + node2: master2 + node3: master3 + node4: node1 + node5: node2 network: # network mapping network_mapping: @@ -64,3 +68,43 @@ engine: installers: kubespray: *idf_kubespray +bmra: + profile: full_nfv + network_roles: + sriov: + - name: eth2 + bus_info: "05:00.0" + device_info: "8086:10f8:0200" + driver: vfio-pci + sriov_dpdk: + - name: eth3 + bus_info: "05:00.1" + device_info: "8086:10f8:0200" + driver: vfio-pci + features: + sriov: + enable: false + sriov_vfs_per_port: 2 + sriov_dpdk_vfs_per_port: 4 + sriov_cni: false + sriov_net_dp: false + hugepages: + enable: false + default: 2M + hugepages_1G: 0 + hugepages_2M: 10240 + isolcpus: + enable: true + cpus: "4-9,14-19,24-29,34-39" + nfd: true + cmk: + enable: true + num_shared_cores: 3 + num_exclusive_cores: 3 + topology_manager: + enable: true + policy: "best-effort" + tas: + enable: true + demo_policy: false + psp: true diff --git a/hw_config/ericsson-pod1/pdf.yaml b/hw_config/ericsson-pod1/pdf.yaml index 7006788..bb8130c 100644 --- a/hw_config/ericsson-pod1/pdf.yaml +++ b/hw_config/ericsson-pod1/pdf.yaml @@ -10,7 +10,7 @@ version: 1.0 details: pod_owner: Ericsson - contact: georg.kunz@ericsson.com + contact: rihab.banday@ericsson.com lab: OPNFV lab location: Sweden type: baremetal @@ -64,6 +64,120 @@ nodes: - ipmi user: opnfv pass: Winter2017 + remote_management: + <<: *remoteparas + address: 172.16.1.16 + mac_address: "14:58:D0:5D:AB:6A" + interfaces: + - name: 'nic1' + speed: 1gb + features: 'dpdk|sriov' + address: 10.0.20.6 + mac_address: "14:58:d0:54:e7:88" + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:17:6b:98" + address: 100.64.200.6 + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:17:6b:99" + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:17:6b:84" + - name: 'nic5' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:17:6b:85" + - name: 'nic6' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + ############################################################################ + - name: node2 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.1.17 + mac_address: "14:58:D0:5D:AB:4D" + interfaces: + - name: 'nic1' + speed: 1gb + features: 'dpdk|sriov' + address: 10.0.20.7 + mac_address: "14:58:d0:54:6a:60" + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + address: 100.64.200.7 + mac_address: "38:ea:a7:17:6b:7c" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:17:6b:7d" + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:17:6b:6c" + - name: 'nic5' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:17:6b:6d" + - name: 'nic6' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + ############################################################################ + - name: node3 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.1.18 + mac_address: "14:58:D0:5D:AB:F2" + interfaces: + - name: 'nic1' + speed: 1gb + features: 'dpdk|sriov' + address: 10.0.20.8 + mac_address: "14:58:D0:54:7A:28" + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + address: 100.64.200.8 + mac_address: "38:ea:a7:17:6a:38" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:17:6a:39" + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:17:6a:3c" + - name: 'nic5' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:17:6a:3d" + - name: 'nic6' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + ############################################################################ + - name: node4 + node: *nodeparams + disks: *disks remote_management: <<: *remoteparas address: 172.16.1.19 @@ -72,9 +186,9 @@ nodes: - name: 'nic1' speed: 1gb features: 'dpdk|sriov' + address: 10.0.20.9 mac_address: "9c:b6:54:8a:95:a0" vlan: native - address: 10.0.20.9 - name: 'nic2' speed: 10gb features: 'dpdk|sriov' @@ -97,10 +211,9 @@ nodes: speed: 10gb features: 'dpdk|sriov' mac_address: "00:00:00:00:00:00" - address: 10.10.10.15 vlan: native ############################################################################ - - name: node2 + - name: node5 node: *nodeparams disks: *disks remote_management: -- cgit 1.2.3-korg