From df5c8c8dc61d605931ba8e92846479990a0193dd Mon Sep 17 00:00:00 2001 From: Rihab Banday Date: Tue, 6 Oct 2020 10:45:04 +0200 Subject: [PATCH] Updated PDF and IDF for Intel POD 19 This change updates the config files for Intel POD 19 based on recent hardware updates. Additionally it adds config for node 3, 4 and 5. Change-Id: I3a8caf6c8f273567057e325ab27d65f8920ba4ad Signed-off-by: Rihab Banday Reviewed-on: https://gerrit.opnfv.org/gerrit/c/kuberef/+/71234 Tested-by: jenkins-ci Reviewed-by: Victor Morales Reviewed-by: Georg Kunz --- hw_config/intel/idf.yaml | 17 ++++-- hw_config/intel/pdf.yaml | 134 ++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 134 insertions(+), 17 deletions(-) diff --git a/hw_config/intel/idf.yaml b/hw_config/intel/idf.yaml index ca5e4f2..ef653d1 100644 --- a/hw_config/intel/idf.yaml +++ b/hw_config/intel/idf.yaml @@ -24,18 +24,25 @@ idf: network: 10.10.191.0 vlan: native mask: 24 - bridge: br-name + dns: + - 8.8.8.8 kubespray: &idf_kubespray nodes_roles: - node1: [k8s-cluster, kube-node, kube-master, etcd, vault] - node2: [k8s-cluster, kube-node] + node1: [k8s-cluster, kube-master, etcd, vault] + 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: pod19-node1 - node2: pod19-node2 + node1: master1 + node2: master2 + node3: master3 + node4: node1 + node5: node2 network: # network mapping network_mapping: diff --git a/hw_config/intel/pdf.yaml b/hw_config/intel/pdf.yaml index 86501a0..d8836ec 100644 --- a/hw_config/intel/pdf.yaml +++ b/hw_config/intel/pdf.yaml @@ -37,24 +37,20 @@ jumphost: type: - ipmi user: root - pass: root + pass: root19 remote_management: <<: *remoteparas address: 10.10.190.10 mac_address: "A4:BF:01:00:03:D1" interfaces: - - name: 'nic1' + - name: 'ens4' address: 10.10.190.211 mac_address: "52:54:00:4a:e8:2d" vlan: native - - name: 'nic2' + - name: 'ens3' address: 192.168.122.113 mac_address: "52:54:00:74:b4:66" vlan: native - - name: 'nic3' - address: 10.10.192.1 - mac_address: "3c:fd:fe:aa:be:24" - vlan: native nodes: - name: node1 node: *nodeparas @@ -73,7 +69,7 @@ nodes: - name: 'nic2' speed: 1gb features: - address: 192.168.11.211 + address: 10.10.191.21 mac_address: "a4:bf:01:4b:55:f5" vlan: native - name: 'nic3' @@ -91,7 +87,7 @@ nodes: - name: 'nic5' speed: 10gb features: 'dpdk|sriov' - address: 10.10.195.2 + address: 10.10.194.2 mac_address: "00:00:00:00:00:00" vlan: native - name: node2 @@ -111,9 +107,9 @@ nodes: - name: 'nic2' speed: 1gb features: - address: 10.10.190.203 + address: 10.10.191.22 mac_address: "a4:bf:01:4b:4f:9d" - vlan: 191 + vlan: native - name: 'nic3' speed: 10gb features: 'dpdk|sriov' @@ -129,6 +125,120 @@ nodes: - name: 'nic5' speed: 10gb features: 'dpdk|sriov' - address: 10.10.195.3 + address: 10.10.194.3 + mac_address: "00:00:00:00:00:00" + vlan: native + - name: node3 + node: *nodeparas + disks: *disks + remote_management: + <<: *remoteparas + address: 10.10.190.13 + mac_address: "A4:BF:01:00:02:4B" + interfaces: + - name: 'nic1' + speed: 1gb + features: + address: 10.10.190.204 + mac_address: "a4:bf:01:4b:4f:5d" + vlan: native + - name: 'nic2' + speed: 1gb + features: + address: 10.10.191.23 + mac_address: "a4:bf:01:4b:4f:5e" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + address: 10.10.192.4 + mac_address: "3c:fd:fe:aa:bd:d4" + vlan: native + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + address: 10.10.193.4 + mac_address: "3c:fd:fe:aa:bd:d5" + vlan: native + - name: 'nic5' + speed: 10gb + features: 'dpdk|sriov' + address: 10.10.194.4 + mac_address: "00:00:00:00:00:00" + vlan: native + - name: node4 + node: *nodeparas + disks: *disks + remote_management: + <<: *remoteparas + address: 10.10.190.14 + mac_address: "A4:BF:01:00:03:5E" + interfaces: + - name: 'nic1' + speed: 1gb + features: + address: 10.10.190.207 + mac_address: "a4:bf:01:4b:4d:2d" + vlan: native + - name: 'nic2' + speed: 1gb + features: + address: 10.10.191.24 + mac_address: "a4:bf:01:4b:4d:2e" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + address: 10.10.192.5 + mac_address: "3c:fd:fe:aa:b9:c8" + vlan: native + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + address: 10.10.193.5 + mac_address: "3c:fd:fe:aa:b9:c9" + vlan: native + - name: 'nic5' + speed: 10gb + features: 'dpdk|sriov' + address: 10.10.194.5 + mac_address: "00:00:00:00:00:00" + vlan: native + - name: node5 + node: *nodeparas + disks: *disks + remote_management: + <<: *remoteparas + address: 10.10.190.15 + mac_address: "A4:BF:01:00:0B:65" + interfaces: + - name: 'nic1' + speed: 1gb + features: + address: 10.10.190.208 + mac_address: "a4:bf:01:4b:56:10" + vlan: native + - name: 'nic2' + speed: 1gb + features: + address: 10.10.191.25 + mac_address: "a4:bf:01:4b:56:11" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + address: 10.10.192.6 + mac_address: "3c:fd:fe:aa:ba:38" + vlan: native + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + address: 10.10.193.6 + mac_address: "3c:fd:fe:aa:ba:39" + vlan: native + - name: 'nic5' + speed: 10gb + features: 'dpdk|sriov' + address: 10.10.194.6 mac_address: "00:00:00:00:00:00" vlan: native -- 2.16.6