From: Guillermo Herrero Date: Thu, 25 Oct 2018 14:33:44 +0000 (+0200) Subject: [IDF] arm-pod10: added as new idf and pdf X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=29a2a5afa1eecd97d81842166ee90fbc226e2a05;p=pharos.git [IDF] arm-pod10: added as new idf and pdf Change-Id: I74b1c7db1e7c7b53518660e92e810ff60f827d64 Signed-off-by: Guillermo Herrero --- diff --git a/labs/arm/idf-pod10.yaml b/labs/arm/idf-pod10.yaml new file mode 100644 index 00000000..4cb325b6 --- /dev/null +++ b/labs/arm/idf-pod10.yaml @@ -0,0 +1,156 @@ +############################################################################## +# Copyright (c) 2018 Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +### ARM POD 10 installer descriptor file ### + +idf: + version: 0.1 + # NOTE: Compass & Joid are not supported on this POD since they require at + # least 3 network ports on all nodes. + installer: ['fuel'] + net_config: + oob: + ip-range: 10.0.21.2-10.0.21.7 + vlan: native + mask: 24 + admin: + interface: 0 + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 + vlan: 2443 + network: 172.16.10.0 + ip-range: 172.16.10.10-172.16.10.254 # Some IPs are in use by lab infra + mask: 24 + storage: + interface: 1 + vlan: 2444 + network: 10.2.0.0 + mask: 24 + private: + interface: 2 + vlan: 2445-2460 + network: 10.1.0.0 + mask: 24 + public: + interface: 1 + vlan: native + network: 10.0.21.0 + ip-range: 10.0.21.100-10.0.21.253 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.0.21.254 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: 'admin20_br0' + mgmt: 'mgmt20_br0' + private: ~ + public: 'public20_br0' + maas: + # MaaS timeouts (in minutes) + timeout_comissioning: 10 + timeout_deploying: 15 + network: + ntp_strata_host1: 1.se.pool.ntp.org + ntp_strata_host2: 0.se.pool.ntp.org + node: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: &interfaces_intel + # Ordered-list, index should be in sync with interface index in PDF + - 'eno1' + - 'eno2' + - 'eno3' + - 'eno4' + - 'enp5s0f0' + - 'enp5s0f1' + busaddr: &busaddr_intel + # Bus-info reported by `ethtool -i ethX` + - '0000:02:00.0' + - '0000:02:00.1' + - '0000:02:00.0' + - '0000:03:00.1' + - '0000:05:00.0' + - '0000:05:00.1' + - interfaces: *interfaces_intel + busaddr: *busaddr_intel + - interfaces: *interfaces_intel + busaddr: *busaddr_intel + - interfaces: + - 'enP5s3' + - 'enP2p1s0f1' + - 'enP2p1s0f2' + - 'enP2p1s0f3' + busaddr: + - '0005:90:00.0' + - '0002:01:00.1' + - '0002:01:00.2' + - '0002:01:00.3' + - interfaces: + - 'enP5p144s0' + - 'enP2p1s0f1' + - 'enP2p1s0f2' + - 'enP2p1s0f3' + - 'enP2p1s0f4' + - 'enP2p1s0f5' + busaddr: + - '0005:90:00.0' + - '0002:01:00.1' + - '0002:01:00.2' + - '0002:01:00.3' + - '0002:01:00.4' + - '0002:01:00.5' + reclass: + node: + - compute_params: &compute_params_intel + common: + nova_cpu_pinning: &nova_cpu_pinning_common_intel "2-15" + compute_hugepages_size: 2M + compute_hugepages_count: 8192 + compute_hugepages_mount: /mnt/hugepages_2M + compute_kernel_isolcpu: *nova_cpu_pinning_common_intel + dpdk: + nova_cpu_pinning: "4-15" + compute_hugepages_size: 2M + compute_hugepages_count: 8192 + compute_hugepages_mount: /mnt/hugepages_2M + compute_kernel_isolcpu: *nova_cpu_pinning_common_intel + compute_dpdk_driver: vfio + compute_ovs_pmd_cpu_mask: "0xc" + compute_ovs_dpdk_socket_mem: "1024" + compute_ovs_dpdk_lcore_mask: "0xc" + compute_ovs_memory_channels: "2" + dpdk0_driver: vfio-pci + dpdk0_n_rxq: 2 + - compute_params: *compute_params_intel + - compute_params: *compute_params_intel + - compute_params: &compute_params_cavium + common: + nova_cpu_pinning: &nova_cpu_pinning_common_arm "8-47" + compute_hugepages_size: 2M + compute_hugepages_count: 8192 + compute_hugepages_mount: /mnt/hugepages_2M + compute_kernel_isolcpu: *nova_cpu_pinning_common_arm + dpdk: + nova_cpu_pinning: "12-47" + compute_hugepages_size: 2M + compute_hugepages_count: 8192 + compute_hugepages_mount: /mnt/hugepages_2M + compute_kernel_isolcpu: *nova_cpu_pinning_common_arm + compute_dpdk_driver: vfio + compute_ovs_pmd_cpu_mask: "0x300" + compute_ovs_dpdk_socket_mem: "2048" + compute_ovs_dpdk_lcore_mask: "0xC00" + compute_ovs_memory_channels: "2" + dpdk0_driver: vfio-pci + dpdk0_n_rxq: 2 + - compute_params: *compute_params_cavium diff --git a/labs/arm/pod10.yaml b/labs/arm/pod10.yaml new file mode 100644 index 00000000..72160d5d --- /dev/null +++ b/labs/arm/pod10.yaml @@ -0,0 +1,311 @@ +############################################################################## +# Copyright (c) 2018 Enea AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +--- +### Enea ARM POD 10 descriptor file ### + +version: 1.0 +details: + pod_owner: ENEA AB + contact: dan.lilliehorn@enea.com + lab: ENEA lab + location: Stockholm, Sweden + type: production + link: https://wiki.opnfv.org/display/pharos/Enea+Hosting +############################################################################## +jumphost: + name: jenkins-slave-arm-pod10 + node: + type: baremetal + vendor: Dell + model: PowerEdge R440 + arch: x86_64 + cpus: 1 + cpu_cflags: skylake + cores: 16 + memory: 96GB + disks: + - name: disk1 + disk_capacity: 240G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + - name: disk2 + disk_capacity: 2T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + os: ubuntu-16.04 + remote_params: &remote_params + type: ipmi + versions: + - 2.0 + user: ADMIN + pass: ADMIN + remote_management: + <<: *remote_params + address: 10.0.21.7 + mac_address: "D0:94:66:87:55:32" + interfaces: + # eno1 + - mac_address: "d0:94:66:87:55:38" + speed: 1gb + features: '' + name: 'nic1' + # eno2 + - mac_address: "d0:94:66:87:55:39" + speed: 1gb + features: '' + name: 'nic2' +############################################################################## +nodes: + - name: intel2660-1 + node: &nodeparams + type: baremetal + vendor: Dell + model: PowerEdge R430 + arch: x86_64 + cpus: 1 + cpu_cflags: 'sandy bridge' + cores: 14 + memory: 128GB + disks: &disks + - name: 'disk1' + disk_capacity: 240G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + - name: 'disk2' + disk_capacity: 240G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + - name: 'disk3' + disk_capacity: 1T + disk_type: ssd + disk_interface: sata + disk_rotation: 7200 + - name: 'disk4' + disk_capacity: 1T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + remote_management: + <<: *remote_params + address: 10.0.21.2 + mac_address: "D0:94:66:58:8C:A8" + interfaces: + # eno1 + - mac_address: "D0:94:66:58:8C:A4" + speed: 1gb + features: '' + name: 'nic1' + # eno2 + - mac_address: "D0:94:66:58:8C:A5" + speed: 1gb + features: '' + name: 'nic2' + # eno3 + - mac_address: "D0:94:66:58:8C:A6" + speed: 1gb + features: '' + name: 'nic3' + # eno4 + - mac_address: "D0:94:66:58:8C:A7" + speed: 1gb + features: '' + name: 'nic4' + # enp5s0f0 + - mac_address: "B4:96:91:31:9D:44" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + # enp5s0f1 + - mac_address: "B4:96:91:31:9D:46" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic6' + ############################################################################ + - name: intel2660-2 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 10.0.21.3 + mac_address: "D0:94:66:6D:9A:DE" + interfaces: + # eno1 + - mac_address: "D0:94:66:6D:9A:DA" + speed: 1gb + features: '' + name: 'nic1' + # eno2 + - mac_address: "D0:94:66:6D:9A:DB" + speed: 1gb + features: '' + name: 'nic2' + # eno3 + - mac_address: "D0:94:66:6D:9A:DC" + speed: 1gb + features: '' + name: 'nic3' + # eno4 + - mac_address: "D0:94:66:6D:9A:DD" + speed: 1gb + features: '' + name: 'nic4' + # enp5s0f0 + - mac_address: "B4:96:91:31:9C:64" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + # enp5s0f1 + - mac_address: "B4:96:91:31:9C:66" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic6' + ############################################################################ + - name: intel2660-3 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 10.0.21.4 + mac_address: "D0:94:66:58:9E:DF" + interfaces: + # eno1 + - mac_address: "D0:94:66:58:9E:DB" + speed: 1gb + features: '' + name: 'nic1' + # eno2 + - mac_address: "D0:94:66:58:9E:DC" + speed: 1gb + features: '' + name: 'nic2' + # eno3 + - mac_address: "D0:94:66:58:9E:DD" + speed: 1gb + features: '' + name: 'nic3' + # eno4 + - mac_address: "D0:94:66:58:9E:DE" + speed: 1gb + features: '' + name: 'nic4' + # enp5s0f0 + - mac_address: "B4:96:91:31:9C:9C" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + # enp5s0f1 + - mac_address: "B4:96:91:31:9C:9E" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic6' + ############################################################################ + - name: cn8890-10 + node: + type: baremetal + vendor: Cavium + model: ThunderX + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 + cores: 48 + memory: 128G + disks: + - name: 'disk1' + disk_capacity: 500G + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + remote_management: + type: ipmi + versions: + - 2.0 + user: admin + pass: admin + address: 10.0.21.5 + mac_address: "40:8D:5C:BA:B9:65" + interfaces: + # enP5s3, Connected, used only for admin/PXE + - mac_address: "68:05:ca:3d:93:0f" + speed: 1gb + features: '' + name: 'nic1' + # enP2p1s0f2, Connected, trunk for all other VLANs + - mac_address: "00:0f:b7:07:00:c1" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + # enP2p1s0f1, Not connected + - mac_address: "00:0f:b7:07:00:c2" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + # enP2p1s0f3, Not connected + - mac_address: "00:0f:b7:07:00:c0" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic4' + ############################################################################ + - name: cn8890-23 + node: + type: baremetal + vendor: Cavium + model: ThunderX + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 + cores: 48 + memory: 64G + disks: + - name: 'disk1' + disk_capacity: 480G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + remote_management: + type: ipmi + versions: + - 2.0 + user: ADMIN + pass: ADMIN + address: 10.0.21.6 + mac_address: "1c:1b:0d:e8:fb:b7" + interfaces: + # enP5p144s0 + - mac_address: "68:05:ca:5a:c3:b9" + speed: 1gb + features: '' + name: 'nic1' + # enP2p1s0f1 + - mac_address: "1c:1b:0d:e8:fb:af" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + # enP2p1s0f2 + - mac_address: "1c:1b:0d:e8:fb:b0" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + # enP2p1s0f3 + - mac_address: "1c:1b:0d:e8:fb:b1" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + # enP2p1s0f4 + - mac_address: "1c:1b:0d:e8:fb:b2" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + # enP2p1s0f5 + - mac_address: "1c:1b:0d:e8:fb:b3" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6'