From fbedab22a44e54ef1d5bab53f8a220c1c6517997 Mon Sep 17 00:00:00 2001 From: Georg Kunz Date: Tue, 8 Sep 2020 17:52:40 +0200 Subject: [PATCH] Extending PDF and IDF of Ericsson pod2 to all nodes Pod2 of the Ericsson OPNFV lab should be used for CI jobs deploying RI2 on all 5 nodes. This adds the missing hardware infos for provisinioning all 5 nodes. Note: The BMRA deployment still considers only 2 nodes. This will be addressed in a separate patch. Signed-off-by: Georg Kunz Change-Id: Ie31365cf04f6fc041d3173099e7c2e8f7020d6b8 Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/71022 Tested-by: jenkins-ci Reviewed-by: Victor Morales Reviewed-by: Rihab Banday --- hw_config/ericsson-pod2/idf.yaml | 8 ++- hw_config/ericsson-pod2/pdf.yaml | 109 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 112 insertions(+), 5 deletions(-) diff --git a/hw_config/ericsson-pod2/idf.yaml b/hw_config/ericsson-pod2/idf.yaml index 0e389b3..a0215f7 100644 --- a/hw_config/ericsson-pod2/idf.yaml +++ b/hw_config/ericsson-pod2/idf.yaml @@ -33,6 +33,9 @@ idf: nodes_roles: node1: [k8s-cluster, kube-node, kube-master, etcd, vault] node2: [k8s-cluster, kube-node] + node3: [k8s-cluster, kube-node] + node4: [k8s-cluster, kube-node] + node5: [k8s-cluster, kube-node] groups: k8s-cluster: - kube-node @@ -40,6 +43,9 @@ idf: hostnames: node1: master0 node2: node0 + node3: node1 + node4: node2 + node5: node3 network: # network mapping network_mapping: @@ -50,7 +56,7 @@ idf: net_mgmt: public engine: - pod_name: ericsson-pod1 + pod_name: ericsson-pod2 net_config: *net_config # net_config network to be used by the PXE diff --git a/hw_config/ericsson-pod2/pdf.yaml b/hw_config/ericsson-pod2/pdf.yaml index 6f4bab4..6c23a38 100644 --- a/hw_config/ericsson-pod2/pdf.yaml +++ b/hw_config/ericsson-pod2/pdf.yaml @@ -40,6 +40,7 @@ jumphost: mac_address: 52:54:00:4a:e8:2d - name: 'ens3' address: 100.64.201.254 + mac_address: 52:54:00:4a:e8:2f ############################################################################## nodes: - name: node1 @@ -73,12 +74,12 @@ nodes: features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:95" vlan: native - address: 10.0.20.11 + address: 10.0.20.12 - name: 'nic2' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:80" - address: 100.64.201.11 + address: 100.64.201.12 vlan: native - name: 'nic3' speed: 10gb @@ -104,13 +105,13 @@ nodes: - name: 'nic1' speed: 1gb features: 'dpdk|sriov' - address: 10.0.20.12 + address: 10.0.20.13 mac_address: "5c:b9:01:8b:a6:31" vlan: native - name: 'nic2' speed: 10gb features: 'dpdk|sriov' - address: 100.64.200.12 + address: 100.64.200.13 mac_address: "5c:b9:01:8b:99:64" vlan: native - name: 'nic3' @@ -125,3 +126,103 @@ nodes: speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:99:65" + ############################################################################ + - name: node3 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.2.14 + mac_address: "58:20:B1:01:8D:32" + interfaces: + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:9d:4d" + address: 10.0.20.14 + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:9d:6c" + address: 100.64.200.14 + vlan: native + - name: 'nic3' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a2:43:c0" + vlan: native + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:9d:4c" + - name: 'nic5' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:9d:6d" + ############################################################################ + - name: node4 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.2.15 + mac_address: "58:20:B1:01:8B:FC" + interfaces: + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a5:fd" + address: 10.0.20.15 + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:08" + address: 100.64.200.15 + vlan: native + - name: 'nic3' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a1:8b:d0" + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a5:fc" + - name: 'nic5' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:09" + ############################################################################ + - name: node5 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.2.16 + mac_address: "58:20:B1:01:8F:EA" + interfaces: + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:e9" + address: 10.0.20.16 + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:97:14" + address: 100.64.200.16 + vlan: native + - name: 'nic3' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a1:bd:60" + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:e8" + - name: 'nic5' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:97:15" -- 2.16.6