diff options
Diffstat (limited to 'labs')
48 files changed, 4967 insertions, 105 deletions
diff --git a/labs/arm/idf-pod10.yaml b/labs/arm/idf-pod10.yaml new file mode 100644 index 00000000..39aac781 --- /dev/null +++ b/labs/arm/idf-pod10.yaml @@ -0,0 +1,148 @@ +############################################################################## +# 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: 25 + 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' + - 'enp5s0f0' + - 'enp5s0f1' + - 'eno2' + - 'eno3' + - 'eno4' + busaddr: &busaddr_intel + # Bus-info reported by `ethtool -i ethX` + - '0000:02:00.0' + - '0000:05:00.0' + - '0000:05:00.1' + - '0000:02:00.1' + - '0000:03:00.0' + - '0000:03:00.1' + - interfaces: *interfaces_intel + busaddr: *busaddr_intel + - interfaces: *interfaces_intel + busaddr: *busaddr_intel + - interfaces: &interfaces_arm + - 'enP5p144s0' + - 'enP2p1s0f1' + - 'enP2p1s0f2' + - 'enP2p1s0f3' + - 'enP2p1s0f4' + - 'enP2p1s0f5' + busaddr: &busaddr_arm + - '0005:90:00.0' + - '0002:01:00.1' + - '0002:01:00.2' + - '0002:01:00.3' + - '0002:01:00.4' + - '0002:01:00.5' + - interfaces: *interfaces_arm + busaddr: *busaddr_arm + 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: uio + compute_ovs_pmd_cpu_mask: "0xc" + compute_ovs_dpdk_socket_mem: "2048" + compute_ovs_dpdk_lcore_mask: "0xc" + compute_ovs_memory_channels: "2" + dpdk0_driver: igb_uio + 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: 1G + compute_hugepages_count: 16 + compute_hugepages_mount: /mnt/hugepages_1G + 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/idf-pod5.yaml b/labs/arm/idf-pod5.yaml index a0c20dff..09fe4cb6 100644 --- a/labs/arm/idf-pod5.yaml +++ b/labs/arm/idf-pod5.yaml @@ -17,6 +17,7 @@ idf: oob: ip-range: 10.0.8.3-10.0.8.10 vlan: native + mask: 24 admin: interface: 0 vlan: native @@ -34,8 +35,8 @@ idf: network: 10.2.0.0 mask: 24 private: - interface: 1 - vlan: 2185 + interface: 2 + vlan: 2185-2200 network: 10.1.0.0 mask: 24 public: @@ -60,6 +61,8 @@ idf: 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 @@ -74,7 +77,41 @@ idf: busaddr: *busaddr - interfaces: *interfaces busaddr: *busaddr - - interfaces: *interfaces - busaddr: *busaddr - - interfaces: *interfaces - busaddr: *busaddr + - interfaces: &interfaces_dual + - 'eth0' + - 'eth1' + - 'enp1s0f0' + - 'enp1s0f1' + busaddr: &busaddr_dual + - 'e0700000.xgmac' + - 'e0900000.xgmac' + - '0000:01:00.0' + - '0000:01:00.1' + - interfaces: *interfaces_dual + busaddr: *busaddr_dual + reclass: + node: + - compute_params: &compute_params + common: + nova_cpu_pinning: &nova_cpu_pinning_common "2,3,4,5,6,7" + compute_hugepages_size: 2M + compute_hugepages_count: 8192 + compute_hugepages_mount: /mnt/hugepages_2M + compute_kernel_isolcpu: *nova_cpu_pinning_common + dpdk: + nova_cpu_pinning: "4-7" + compute_hugepages_size: 2M + compute_hugepages_count: 8192 + compute_hugepages_mount: /mnt/hugepages_2M + compute_kernel_isolcpu: *nova_cpu_pinning_common + compute_dpdk_driver: uio + compute_ovs_pmd_cpu_mask: "0xc" + compute_ovs_dpdk_socket_mem: "4096" + compute_ovs_dpdk_lcore_mask: "0xc" + compute_ovs_memory_channels: "2" + dpdk0_driver: igb_uio + dpdk0_n_rxq: 2 + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params diff --git a/labs/arm/idf-pod6.yaml b/labs/arm/idf-pod6.yaml index 4599358a..6d6c9c37 100644 --- a/labs/arm/idf-pod6.yaml +++ b/labs/arm/idf-pod6.yaml @@ -10,10 +10,12 @@ idf: version: 0.1 + installer: ['apex', 'compass4nfv', 'daisy', 'fuel'] net_config: oob: ip-range: 10.0.1.54-10.0.1.58 vlan: native + mask: 24 admin: interface: 0 vlan: native @@ -32,7 +34,7 @@ idf: mask: 24 private: interface: 2 - vlan: 2325 + vlan: 2325-2340 network: 10.1.0.0 mask: 24 public: @@ -57,6 +59,8 @@ idf: 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 @@ -87,21 +91,21 @@ idf: node: - compute_params: &compute_params common: - nova_cpu_pinning: &nova_cpu_pinning_common "1,2,3,4,5,6,7,8,9,10,11,12" + nova_cpu_pinning: &nova_cpu_pinning_common "8-47" compute_hugepages_size: 2M compute_hugepages_count: 8192 compute_hugepages_mount: /mnt/hugepages_2M compute_kernel_isolcpu: *nova_cpu_pinning_common dpdk: - nova_cpu_pinning: "5-7,13-15" - compute_hugepages_size: 2M - compute_hugepages_count: 8192 - compute_hugepages_mount: /mnt/hugepages_2M - compute_kernel_isolcpu: 2,3,5,6,7,10,11,13,14,15 + nova_cpu_pinning: "12-47" + compute_hugepages_size: 1G + compute_hugepages_count: 16 + compute_hugepages_mount: /mnt/hugepages_1G + compute_kernel_isolcpu: *nova_cpu_pinning_common compute_dpdk_driver: vfio - compute_ovs_pmd_cpu_mask: "0xc04" + compute_ovs_pmd_cpu_mask: "0x300" compute_ovs_dpdk_socket_mem: "2048" - compute_ovs_dpdk_lcore_mask: "0x8" + compute_ovs_dpdk_lcore_mask: "0xC00" compute_ovs_memory_channels: "2" dpdk0_driver: vfio-pci dpdk0_n_rxq: 2 diff --git a/labs/arm/idf-pod7.yaml b/labs/arm/idf-pod7.yaml index a8041a2d..2cc681bf 100644 --- a/labs/arm/idf-pod7.yaml +++ b/labs/arm/idf-pod7.yaml @@ -17,6 +17,7 @@ idf: oob: ip-range: 10.0.16.2-10.0.16.6 vlan: native + mask: 24 admin: interface: 0 vlan: native @@ -35,7 +36,7 @@ idf: mask: 24 private: interface: 1 - vlan: 2345 + vlan: 2345-2360 network: 10.1.0.0 mask: 24 public: @@ -60,6 +61,8 @@ idf: 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_a @@ -97,9 +100,9 @@ idf: compute_kernel_isolcpu: *nova_cpu_pinning_common_a dpdk: nova_cpu_pinning: "4-47" - compute_hugepages_size: 2M - compute_hugepages_count: 8192 - compute_hugepages_mount: /mnt/hugepages_2M + compute_hugepages_size: 1G + compute_hugepages_count: 16 + compute_hugepages_mount: /mnt/hugepages_1G compute_kernel_isolcpu: *nova_cpu_pinning_common_a compute_dpdk_driver: vfio compute_ovs_pmd_cpu_mask: "0xc" diff --git a/labs/arm/idf-pod8.yaml b/labs/arm/idf-pod8.yaml new file mode 100644 index 00000000..f5ef7241 --- /dev/null +++ b/labs/arm/idf-pod8.yaml @@ -0,0 +1,113 @@ +############################################################################## +# 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 8 installer descriptor file ### + +idf: + version: 0.1 + installer: ['apex', 'compass4nfv', 'daisy', 'fuel'] + net_config: + oob: + ip-range: 10.0.19.2-10.0.19.7 + vlan: native + mask: 24 + admin: + interface: 0 + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 + vlan: 2403 + 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: 2404 + network: 10.2.0.0 + mask: 24 + private: + interface: 2 + vlan: 2405-2420 + network: 10.1.0.0 + mask: 24 + public: + interface: 1 + vlan: native + network: 10.0.19.0 + ip-range: 10.0.19.100-10.0.19.253 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.0.19.254 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: 'admin18_br0' + mgmt: 'mgmt18_br0' + private: ~ + public: 'public18_br0' + maas: + # MaaS timeouts (in minutes) + timeout_comissioning: 10 + timeout_deploying: 15 + network: + node: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: &interfaces + # Ordered-list, index should be in sync with interface index in PDF + - 'enP5p144s0' + - 'enP2p1s0f1' + - 'enP2p1s0f2' + - 'enP2p1s0f3' + - 'enP2p1s0f4' + - 'enP2p1s0f5' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0005:90:00.0' + - '0002:01:00.1' + - '0002:01:00.2' + - '0002:01:00.3' + - '0002:01:00.4' + - '0002:01:00.5' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + reclass: + node: + - compute_params: &compute_params + common: + nova_cpu_pinning: &nova_cpu_pinning_common "8-47" + compute_hugepages_size: 2M + compute_hugepages_count: 8192 + compute_hugepages_mount: /mnt/hugepages_2M + compute_kernel_isolcpu: *nova_cpu_pinning_common + dpdk: + nova_cpu_pinning: "12-47" + compute_hugepages_size: 1G + compute_hugepages_count: 16 + compute_hugepages_mount: /mnt/hugepages_1G + compute_kernel_isolcpu: *nova_cpu_pinning_common + 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 + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params diff --git a/labs/arm/idf-pod9.yaml b/labs/arm/idf-pod9.yaml new file mode 100644 index 00000000..b6252d36 --- /dev/null +++ b/labs/arm/idf-pod9.yaml @@ -0,0 +1,117 @@ +############################################################################## +# 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 9 installer descriptor file ### + +idf: + version: 0.1 + installer: ['apex', 'compass4nfv', 'daisy', 'fuel'] + net_config: + oob: + ip-range: 10.0.20.2-10.0.20.7 + vlan: native + mask: 24 + admin: + interface: 0 + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 + vlan: 2423 + 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: 2424 + network: 10.2.0.0 + mask: 24 + private: + interface: 2 + vlan: 2425-2440 + network: 10.1.0.0 + mask: 24 + public: + interface: 1 + vlan: native + network: 10.0.20.0 + ip-range: 10.0.20.100-10.0.20.253 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.0.20.254 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: 'admin19_br0' + mgmt: 'mgmt19_br0' + private: ~ + public: 'public19_br0' + maas: + # MaaS timeouts (in minutes) + timeout_comissioning: 14 + timeout_deploying: 24 + network: + node: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: &interfaces + # Ordered-list, index should be in sync with interface index in PDF + - 'enP9p144s0' + - 'enP2p1s0f1' + - 'enP2p1s0f2' + - 'enP2p1s0f3' + - 'enP2p1s0f4' + - 'enP2p1s0f5' + - 'enP6p1s0f1' + - 'enP6p1s0f2' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0009:90:00.0' + - '0002:01:00.1' + - '0002:01:00.2' + - '0002:01:00.3' + - '0002:01:00.4' + - '0002:01:00.5' + - '0006:01:00.1' + - '0006:01:00.2' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + reclass: + node: + - compute_params: &compute_params + common: + nova_cpu_pinning: &nova_cpu_pinning_common "8-47" + compute_hugepages_size: 2M + compute_hugepages_count: 8192 + compute_hugepages_mount: /mnt/hugepages_2M + compute_kernel_isolcpu: *nova_cpu_pinning_common + dpdk: + nova_cpu_pinning: "12-47" + compute_hugepages_size: 1G + compute_hugepages_count: 16 + compute_hugepages_mount: /mnt/hugepages_1G + compute_kernel_isolcpu: *nova_cpu_pinning_common + 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 + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params diff --git a/labs/arm/idf-virtual2.yaml b/labs/arm/idf-virtual2.yaml new file mode 100644 index 00000000..85529187 --- /dev/null +++ b/labs/arm/idf-virtual2.yaml @@ -0,0 +1,84 @@ +############################################################################## +# 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 VIRTUAL 2 installer descriptor file ### + +idf: + version: 0.1 + net_config: + oob: + interface: 0 + ip-range: ~ + vlan: native + mask: 24 + # All networks (except OOB) are virtual networks managed by `libvirt` + # Interface indexes are based on Fuel installer defaults + admin: + interface: 0 # when used, should be first vnet interface, untagged + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 # when used, should be second vnet interface, untagged + vlan: native + 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: 4 + vlan: native + network: 192.168.20.0 + mask: 24 + private: + interface: 2 + vlan: 1000-1999 + network: 10.1.0.0 + mask: 24 + public: + interface: 3 + vlan: native + network: 10.0.9.0 + ip-range: 10.0.9.100-10.0.9.253 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.0.9.254 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: ~ + mgmt: ~ + private: ~ + public: 'public' + network: + interface_mtu: 9000 + 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 + # Ordered-list, index should be in sync with interface index in PDF + - 'enp1s0' + - 'enp2s0' + - 'enp3s0' + - 'enp4s0' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:01:00.0' + - '0000:02:00.0' + - '0000:03:00.0' + - '0000:04:00.0' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr diff --git a/labs/arm/pod10.yaml b/labs/arm/pod10.yaml new file mode 100644 index 00000000..0199c584 --- /dev/null +++ b/labs/arm/pod10.yaml @@ -0,0 +1,322 @@ +############################################################################## +# 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' + # enp5s0f0 + - mac_address: "B4:96:91:31:9D:44" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + # enp5s0f1 + - mac_address: "B4:96:91:31:9D:46" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + # eno2 UNUSED + - mac_address: "D0:94:66:58:8C:A5" + speed: 1gb + features: '' + name: 'nic4' + # eno3 UNUSED + - mac_address: "D0:94:66:58:8C:A6" + speed: 1gb + features: '' + name: 'nic5' + # eno4 UNUSED + - mac_address: "D0:94:66:58:8C:A7" + speed: 1gb + features: '' + 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' + # enp5s0f0 + - mac_address: "B4:96:91:31:9C:64" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + # enp5s0f1 + - mac_address: "B4:96:91:31:9C:66" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + # eno2 UNUSED + - mac_address: "D0:94:66:6D:9A:DB" + speed: 1gb + features: '' + name: 'nic4' + # eno3 UNUSED + - mac_address: "D0:94:66:6D:9A:DC" + speed: 1gb + features: '' + name: 'nic5' + # eno4 UNUSED + - mac_address: "D0:94:66:6D:9A:DD" + speed: 1gb + features: '' + 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' + # enp5s0f0 + - mac_address: "B4:96:91:31:9C:9C" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + # enp5s0f1 + - mac_address: "B4:96:91:31:9C:9E" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + # eno2 UNUSED + - mac_address: "D0:94:66:58:9E:DC" + speed: 1gb + features: '' + name: 'nic4' + # eno3 UNUSED + - mac_address: "D0:94:66:58:9E:DD" + speed: 1gb + features: '' + name: 'nic5' + # eno4 UNUSED + - mac_address: "D0:94:66:58:9E:DE" + speed: 1gb + features: '' + name: 'nic6' + ############################################################################ + - name: cn8890-14 + 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: 240G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + remote_management: + type: ipmi + versions: + - 2.0 + user: ADMIN + pass: ADMIN + address: 10.0.21.5 + mac_address: "1c:1b:0d:60:ed:9b" + interfaces: + # enP5144s0, Connected, used only for admin/PXE + - mac_address: "68:05:ca:42:cb:e5" + speed: 1gb + features: '' + name: 'nic1' + # enP2p1s0f1, Connected, trunk for all other VLANs + - mac_address: "1c:1b:0d:60:ed:96" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + # enP2p1s0f2, private + - mac_address: "1c:1b:0d:60:ed:97" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + # enP2p1s0f3, Not connected + - mac_address: "1c:1b:0d:60:ed:98" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + # enP2p1s0f4, Not connected + - mac_address: "1c:1b:0d:60:ed:99" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + # enP2p1s0f5, Not connected + - mac_address: "1c:1b:0d:60:ed:9a" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic4' + + ############################################################################ + - name: cn8890-15 + 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: 240G + 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:60:ed:b7" + interfaces: + # enP5p144s0 + - mac_address: "68:05:ca:42:cb:e8" + speed: 1gb + features: '' + name: 'nic1' + # enP2p1s0f1 + - mac_address: "1c:1b:0d:60:ed:b2" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + # enP2p1s0f2 + - mac_address: "1c:1b:0d:60:ed:b3" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + # enP2p1s0f3, Not connected + - mac_address: "1c:1b:0d:60:ed:b4" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + # enP2p1s0f4, Not connected + - mac_address: "1c:1b:0d:60:ed:b5" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + # enP2p1s0f5, Not connected + - mac_address: "1c:1b:0d:60:ed:b6" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6' diff --git a/labs/arm/pod5.yaml b/labs/arm/pod5.yaml index 3a55678e..35d46017 100644 --- a/labs/arm/pod5.yaml +++ b/labs/arm/pod5.yaml @@ -156,6 +156,14 @@ nodes: speed: 10gb features: '' name: 'nic2' + - mac_address: "ac:1f:6b:8a:82:84" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "ac:1f:6b:8a:82:85" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' ############################################################################ - name: softiron-7 node: *nodeparams @@ -173,3 +181,11 @@ nodes: speed: 10gb features: '' name: 'nic2' + - mac_address: "ac:1f:6b:8a:82:a0" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "ac:1f:6b:8a:82:a1" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' diff --git a/labs/arm/pod8.yaml b/labs/arm/pod8.yaml new file mode 100644 index 00000000..00386d58 --- /dev/null +++ b/labs/arm/pod8.yaml @@ -0,0 +1,263 @@ +############################################################################## +# 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 8 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-pod8 + node: + type: baremetal + vendor: Cavium + model: ThunderX + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 + cores: 48 + memory: 256G + disks: + ## /dev/sda + - name: disk1 + disk_capacity: 480G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + ## /dev/sdb + - 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.19.2 + mac_address: "1C:1B:0D:E7:49:E7" + interfaces: + - mac_address: "68:05:CA:62:44:BE" + speed: 1gb + features: '' + name: 'nic1' + - mac_address: "1C:1B:0D:E7:49:DF" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "1C:1B:0D:E7:49:E0" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "1C:1B:0D:E7:49:E1" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "1C:1B:0D:E7:49:E2" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "1C:1B:0D:E7:49:E3" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6' +############################################################################## +nodes: + - name: cn8890-35 + node: &nodeparams + type: baremetal + vendor: Cavium + model: ThunderX + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 + cores: 48 + memory: 256G + disks: &disks + - name: disk1 + disk_capacity: 480G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + - name: disk2 + disk_capacity: 2T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + remote_management: + <<: *remote_params + address: 10.0.19.3 + mac_address: "1C:1B:0D:E8:FB:7B" + interfaces: + - mac_address: "68:05:CA:7B:3A:36" + speed: 1gb + features: '' + name: 'nic1' + - mac_address: "1C:1B:0D:E8:FB:73" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "1C:1B:0D:E8:FB:74" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "1C:1B:0D:E8:FB:75" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "1C:1B:0D:E8:FB:76" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "1C:1B:0D:E8:FB:77" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6' + ############################################################################ + - name: cn8890-36 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 10.0.19.4 + mac_address: "1C:1B:0D:EF:75:6A" + interfaces: + - mac_address: "68:05:CA:7B:3A:D5" + speed: 1gb + features: '' + name: 'nic1' + - mac_address: "1C:1B:0D:EF:75:62" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "1C:1B:0D:EF:75:63" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "1C:1B:0D:EF:75:64" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "1C:1B:0D:EF:75:65" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "1C:1B:0D:EF:75:66" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6' + ############################################################################ + - name: cn8890-37 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 10.0.19.5 + mac_address: "1C:1B:0D:EF:74:DE" + interfaces: + - mac_address: "68:05:CA:62:44:96" + speed: 1gb + features: '' + name: 'nic1' + - mac_address: "1C:1B:0D:EF:74:D6" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "1C:1B:0D:EF:74:D7" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "1C:1B:0D:EF:74:D8" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "1C:1B:0D:EF:74:D9" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "1C:1B:0D:EF:74:DA" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6' + ############################################################################ + - name: cn8890-38 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 10.0.19.6 + mac_address: "1C:1B:0D:EF:74:CA" + interfaces: + - mac_address: "68:05:CA:62:44:FB" + speed: 1gb + features: '' + name: 'nic1' + - mac_address: "1C:1B:0D:EF:74:C2" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "1C:1B:0D:EF:74:C3" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "1C:1B:0D:EF:74:C4" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "1C:1B:0D:EF:74:C5" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "1C:1B:0D:EF:74:C6" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6' + ############################################################################ + - name: cn8890-39 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 10.0.19.7 + mac_address: "1C:1B:0D:EF:74:8E" + interfaces: + - mac_address: "68:05:CA:62:44:56" + speed: 1gb + features: '' + name: 'nic1' + - mac_address: "1C:1B:0D:EF:74:86" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "1C:1B:0D:EF:74:87" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "1C:1B:0D:EF:74:88" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "1C:1B:0D:EF:74:89" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "1C:1B:0D:EF:74:8A" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6' diff --git a/labs/arm/pod9.yaml b/labs/arm/pod9.yaml new file mode 100644 index 00000000..3669a34c --- /dev/null +++ b/labs/arm/pod9.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 9 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-pod8 + node: + type: baremetal + vendor: Cavium + model: ThunderX + arch: aarch64 + cpus: 2 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 + cores: 48 + memory: 256G + disks: + ## /dev/sda + - name: disk1 + disk_capacity: 480G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + ## /dev/sdb + - 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.20.2 + mac_address: "1C:1B:0D:60:EB:F3" + interfaces: + - mac_address: "68:05:CA:7B:0B:BD" + speed: 1gb + features: '' + name: 'nic1' + - mac_address: "1C:1B:0D:60:EB:EC" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "1C:1B:0D:60:EB:ED" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "1C:1B:0D:60:EB:EE" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "1C:1B:0D:60:EB:EF" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "1C:1B:0D:60:EB:F0" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6' + - mac_address: "1C:1B:0D:60:EB:F1" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic7' + - mac_address: "1C:1B:0D:60:EB:F2" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic8' +############################################################################## +nodes: + - name: cn8890-41 + node: &nodeparams + type: baremetal + vendor: Cavium + model: ThunderX + arch: aarch64 + cpus: 2 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 + cores: 48 + memory: 256G + disks: &disks + - name: disk1 + disk_capacity: 480G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + - name: disk2 + disk_capacity: 2T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + remote_management: + <<: *remote_params + address: 10.0.20.3 + mac_address: "40:8D:5C:E7:B1:FD" + interfaces: + - mac_address: "68:05:CA:7B:3B:F5" + speed: 1gb + features: '' + name: 'nic1' + - mac_address: "40:8D:5C:E7:B1:F6" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "40:8D:5C:E7:B1:F7" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "40:8D:5C:E7:B1:F8" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "40:8D:5C:E7:B1:F9" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "40:8D:5C:E7:B1:FA" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6' + - mac_address: "40:8D:5C:E7:B1:FB" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic7' + - mac_address: "40:8D:5C:E7:B1:FC" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic8' + ############################################################################ + - name: cn8890-42 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 10.0.20.4 + mac_address: "40:8D:5C:E7:B3:17" + interfaces: + - mac_address: "68:05:CA:7B:3C:4D" + speed: 1gb + features: '' + name: 'nic1' + - mac_address: "40:8D:5C:E7:B3:10" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "40:8D:5C:E7:B3:11" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "40:8D:5C:E7:B3:12" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "40:8D:5C:E7:B3:13" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "40:8D:5C:E7:B3:14" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6' + - mac_address: "40:8D:5C:E7:B3:15" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic7' + - mac_address: "40:8D:5C:E7:B3:16" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic8' + ############################################################################ + - name: cn8890-43 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 10.0.20.5 + mac_address: "40:8D:5C:E7:B2:AB" + interfaces: + - mac_address: "68:05:CA:7B:0B:C0" + speed: 1gb + features: '' + name: 'nic1' + - mac_address: "40:8D:5C:E7:B2:A4" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "40:8D:5C:E7:B2:A5" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "40:8D:5C:E7:B2:A6" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "40:8D:5C:E7:B2:A7" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "40:8D:5C:E7:B2:A8" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6' + - mac_address: "40:8D:5C:E7:B2:A9" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic7' + - mac_address: "40:8D:5C:E7:B2:AA" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic8' + ############################################################################ + - name: cn8890-44 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 10.0.20.6 + mac_address: "1C:1B:0D:60:EC:17" + interfaces: + - mac_address: "68:05:CA:7B:0D:A5" + speed: 1gb + features: '' + name: 'nic1' + - mac_address: "1C:1B:0D:60:EC:10" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "1C:1B:0D:60:EC:11" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "1C:1B:0D:60:EC:12" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "1C:1B:0D:60:EC:13" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "1C:1B:0D:60:EC:14" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6' + - mac_address: "1C:1B:0D:60:EC:15" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic7' + - mac_address: "1C:1B:0D:60:EC:16" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic8' + ############################################################################ + - name: cn8890-45 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 10.0.20.7 + mac_address: "40:8D:5C:E7:B3:20" + interfaces: + - mac_address: "68:05:CA:7B:3C:90" + speed: 1gb + features: '' + name: 'nic1' + - mac_address: "40:8D:5C:E7:B3:19" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "40:8D:5C:E7:B3:1A" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "40:8D:5C:E7:B3:1B" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "40:8D:5C:E7:B3:1C" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "40:8D:5C:E7:B3:1D" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic6' + - mac_address: "40:8D:5C:E7:B3:1E" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic7' + - mac_address: "40:8D:5C:E7:B3:1F" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic8' diff --git a/labs/arm/virtual2.yaml b/labs/arm/virtual2.yaml new file mode 100644 index 00000000..f19a5de6 --- /dev/null +++ b/labs/arm/virtual2.yaml @@ -0,0 +1,147 @@ +############################################################################## +# 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 VIRTUAL 2 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-virtual2 + 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: &diskrotation 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.1.34 + mac_address: "00:00:00:00:00:00" + interfaces: + # Connected, used only for admin/PXE, enm5p144s0 + - mac_address: "68:05:ca:3d:93:0c" + speed: 1gb + features: 'dpdk|sriov' + name: 'nic1' + # Not connected for now, enm2p1s0f1 + - mac_address: "00:0f:b7:06:00:c0" + speed: 40gb + features: 'dpdk|sriov' + name: 'nic2' + # Connected, trunk for public, enm2p1s0f2 + - mac_address: "00:0f:b7:06:00:c1" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + # Connected, enm2p1s0f3 + - mac_address: "00:0f:b7:06:00:c2" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' +############################################################################## +nodes: + - name: node-1 + node: &nodeparams + # Fuel overrides certain params (e.g. cpus, mem) based on node role later + type: virtual + vendor: libvirt + model: virt + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 cpuid + cores: 8 + memory: 6G + disks: &disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: 7200 + remote_management: &remotemgmt + type: libvirt + user: changeme + pass: changeme + address: 'qemu:///system' + interfaces: &interfaces + - name: 'nic1' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt + vlan: native + - name: 'nic2' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic3' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic4' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + ############################################################################ + - name: node-2 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-3 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-4 + node: *nodeparams + disks: &compute_disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + - name: 'disk2' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-5 + node: *nodeparams + disks: *compute_disks + remote_management: *remotemgmt + interfaces: *interfaces diff --git a/labs/bii/idf-pod1.yaml b/labs/bii/idf-pod1.yaml index d6944795..00b6d126 100644 --- a/labs/bii/idf-pod1.yaml +++ b/labs/bii/idf-pod1.yaml @@ -12,12 +12,13 @@ idf: version: 0.1 # NOTE: Temporarily disable Daisy check, since it requires 'storage' network # to be defined in 'idf.net_config' below. - installer: ['apex', 'compass4nfv', 'fuel', 'joid'] + installer: ['apex', 'compass4nfv', 'fuel'] net_config: oob: # IPMI management network interface: 0 ip-range: 192.168.20.200-192.168.20.205 vlan: native + mask: 29 admin: interface: 0 vlan: native @@ -30,7 +31,7 @@ idf: mask: 24 private: interface: 3 - vlan: 102 + vlan: 102-132 network: 192.168.102.0 mask: 24 public: diff --git a/labs/ericsson/idf-pod1.yaml b/labs/ericsson/idf-pod1.yaml index 6c02a4ce..c08016b2 100644 --- a/labs/ericsson/idf-pod1.yaml +++ b/labs/ericsson/idf-pod1.yaml @@ -10,11 +10,13 @@ idf: version: 0.1 + installer: ['apex', 'compass4nfv', 'daisy', 'fuel'] net_config: oob: interface: 0 ip-range: 172.16.1.16-172.16.1.21 vlan: native + mask: 29 admin: interface: 4 vlan: native @@ -33,7 +35,7 @@ idf: mask: 24 private: interface: 3 - vlan: 1000 + vlan: 1000-1030 network: 192.168.2.0 mask: 24 public: @@ -54,6 +56,8 @@ idf: private: ~ public: 'br-external' 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 diff --git a/labs/ericsson/idf-pod2.yaml b/labs/ericsson/idf-pod2.yaml index 01f87faa..301241b6 100644 --- a/labs/ericsson/idf-pod2.yaml +++ b/labs/ericsson/idf-pod2.yaml @@ -6,7 +6,127 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## --- +### ERICSSON POD 2 installer descriptor file ### idf: version: 0.1 - # NOTE: Fuel checking is disabled until 'idf.fuel' is defined below - installer: ['apex', 'compass4nfv', 'daisy', 'joid'] + installer: ['apex', 'compass4nfv', 'daisy', 'osa'] + net_config: &net_config + admin: + interface: 2 + network: 192.168.122.0 # Untagged, 'PXE/Admin' on wiki, different IP + mask: 24 + mgmt: + interface: 1 + network: 172.29.236.0 + mask: 22 + storage: + interface: 3 + network: 172.29.240.0 # Tagged, not the same with 'storage' on wiki + mask: 22 + private: + interface: 4 + network: 172.29.242.0 # Tagged, not the same with 'private' on wiki + mask: 22 + public: + interface: 2 + network: 192.168.122.0 # Untagged, 'public' on wiki + mask: 24 + gateway: 192.168.122.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + osa: &idf_osa + nodes_roles: + opnfv: [deployment] + node1: [controller] + node2: [compute, storage] + node3: [compute, storage] + node4: [controller] + node5: [controller] + groups: + openstack: + - controller + - compute + - storage + hostnames: + opnfv: opnfv + node1: controller00 + node2: compute00 + node3: compute01 + node4: controller01 + node5: controller02 + network: + # network mapping + network_mapping: + # Management network used by installer components to communicate + net-mgmt: admin + # Storage Network + net-storage: storage + # Internal network for communication between VNF + net-internal: private + # Public network for VNF remote acces (ext-net in Openstack) + net-vnf: public + deployment_host_interfaces: + # Ordered-list, index should be in sync with interface index in PDF + - 'eno49' + - 'ens1f0' + - 'ens1f1' + - 'ens2f0' + - 'ens2f1' + kubespray: &idf_kubespray + nodes_roles: + opnvf: [opnfv] + node1: [kube-master, etcd, vault] + node2: [kube-node] + node3: [kube-node] + node4: [kube-master, etcd, vault] + node5: [kube-master, etcd, vault] + groups: + k8s-cluster: + - kube-node + - kube-master + hostnames: + opnfv: opnfv + node1: master1 + node2: node1 + node3: node2 + node4: master2 + node5: master3 + + +xci: + pod_name: pod1 + net_config: *net_config + flavors: + mini: + - opnfv + - node1 + - node2 + noha: + - opnfv + - node1 + - node2 + - node3 + ha: + - opnfv + - node1 + - node2 + - node3 + - node4 + - node5 + + # net_config network to be used by the PXE + pxe_network: public + + # As the MAC of generated bridges are generated, we use a list of local + # bridges to create libvirt networks + jumphost_interfaces_bridges: + - name: virbr0 + ip: 192.168.122.1 + + extra_addresses: + opnfv: 192.168.122.2 + + installers: + osa: *idf_osa + kubespray: *idf_kubespray diff --git a/labs/ericsson/idf-virtual-pod1bl01.yaml b/labs/ericsson/idf-virtual-pod1bl01.yaml new file mode 100644 index 00000000..62db57d4 --- /dev/null +++ b/labs/ericsson/idf-virtual-pod1bl01.yaml @@ -0,0 +1,105 @@ +############################################################################## +# Copyright (c) 2018 Ericsson AB, Mirantis Inc., 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 +############################################################################## +--- +### ericsson-virtual-pod1bl01 Installer descriptor file ### + +idf: + version: 0.1 + net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + oob: + interface: 0 + ip-range: ~ + vlan: native + mask: 24 + # All networks (except OOB) are virtual networks managed by `libvirt` + # Interface indexes are based on Fuel installer defaults + admin: + interface: 0 # when used, will be first vnet interface, untagged + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 # when used, will be second vnet interface, untagged + vlan: native + 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: 4 # when used, will be fifth vnet interface, untagged + vlan: native + network: 192.168.20.0 + mask: 24 + private: + interface: 2 # when used, will be third vnet interface, untagged + vlan: 1000-1999 + network: 10.1.0.0 + mask: 24 + public: + interface: 3 # when used, will be fourth vnet interface, untagged + vlan: native + network: 10.16.0.0 + ip-range: 10.16.0.100-10.16.0.254 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.16.0.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: ~ + mgmt: ~ + private: ~ + public: ~ + network: + interface_mtu: 9000 + 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 + # Ordered-list, index should be in sync with interface index in PDF + - 'ens3' + - 'ens4' + - 'ens5' + - 'ens6' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:00:03.0' + - '0000:00:04.0' + - '0000:00:05.0' + - '0000:00:06.0' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + reclass: + node: + - compute_params: &compute_params + common: &compute_params_common + compute_hugepages_size: 2M + compute_hugepages_count: 5120 + compute_hugepages_mount: /mnt/hugepages_2M + dpdk: + <<: *compute_params_common + compute_dpdk_driver: uio + compute_ovs_pmd_cpu_mask: "0x6" + compute_ovs_dpdk_socket_mem: "3072" + compute_ovs_dpdk_lcore_mask: "0x8" + compute_ovs_memory_channels: "2" + dpdk0_driver: igb_uio + dpdk0_n_rxq: 2 + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params diff --git a/labs/ericsson/idf-virtual1.yaml b/labs/ericsson/idf-virtual1.yaml new file mode 100644 index 00000000..2a997c38 --- /dev/null +++ b/labs/ericsson/idf-virtual1.yaml @@ -0,0 +1,105 @@ +############################################################################## +# Copyright (c) 2018 Ericsson AB, Mirantis Inc., 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 +############################################################################## +--- +### ericsson-virtual1 Installer descriptor file ### + +idf: + version: 0.1 + net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + oob: + interface: 0 + ip-range: ~ + vlan: native + mask: 24 + # All networks (except OOB) are virtual networks managed by `libvirt` + # Interface indexes are based on Fuel installer defaults + admin: + interface: 0 # when used, will be first vnet interface, untagged + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 # when used, will be second vnet interface, untagged + vlan: native + 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: 4 # when used, will be fifth vnet interface, untagged + vlan: native + network: 192.168.20.0 + mask: 24 + private: + interface: 2 # when used, will be third vnet interface, untagged + vlan: 1000-1999 + network: 10.1.0.0 + mask: 24 + public: + interface: 3 # when used, will be fourth vnet interface, untagged + vlan: native + network: 10.16.0.0 + ip-range: 10.16.0.100-10.16.0.254 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.16.0.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: ~ + mgmt: ~ + private: ~ + public: ~ + network: + interface_mtu: 9000 + 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 + # Ordered-list, index should be in sync with interface index in PDF + - 'ens3' + - 'ens4' + - 'ens5' + - 'ens6' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:00:03.0' + - '0000:00:04.0' + - '0000:00:05.0' + - '0000:00:06.0' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + reclass: + node: + - compute_params: &compute_params + common: &compute_params_common + compute_hugepages_size: 2M + compute_hugepages_count: 5120 + compute_hugepages_mount: /mnt/hugepages_2M + dpdk: + <<: *compute_params_common + compute_dpdk_driver: uio + compute_ovs_pmd_cpu_mask: "0x6" + compute_ovs_dpdk_socket_mem: "3072" + compute_ovs_dpdk_lcore_mask: "0x8" + compute_ovs_memory_channels: "2" + dpdk0_driver: igb_uio + dpdk0_n_rxq: 2 + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params diff --git a/labs/ericsson/idf-virtual2.yaml b/labs/ericsson/idf-virtual2.yaml new file mode 100644 index 00000000..1b200778 --- /dev/null +++ b/labs/ericsson/idf-virtual2.yaml @@ -0,0 +1,105 @@ +############################################################################## +# Copyright (c) 2018 Ericsson AB, Mirantis Inc., 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 +############################################################################## +--- +### ericsson-virtual2 Installer descriptor file ### + +idf: + version: 0.1 + net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + oob: + interface: 0 + ip-range: ~ + vlan: native + mask: 24 + # All networks (except OOB) are virtual networks managed by `libvirt` + # Interface indexes are based on Fuel installer defaults + admin: + interface: 0 # when used, will be first vnet interface, untagged + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 # when used, will be second vnet interface, untagged + vlan: native + 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: 4 # when used, will be fifth vnet interface, untagged + vlan: native + network: 192.168.20.0 + mask: 24 + private: + interface: 2 # when used, will be third vnet interface, untagged + vlan: 1000-1999 + network: 10.1.0.0 + mask: 24 + public: + interface: 3 # when used, will be fourth vnet interface, untagged + vlan: native + network: 10.16.0.0 + ip-range: 10.16.0.100-10.16.0.254 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.16.0.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: ~ + mgmt: ~ + private: ~ + public: ~ + network: + interface_mtu: 9000 + 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 + # Ordered-list, index should be in sync with interface index in PDF + - 'ens3' + - 'ens4' + - 'ens5' + - 'ens6' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:00:03.0' + - '0000:00:04.0' + - '0000:00:05.0' + - '0000:00:06.0' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + reclass: + node: + - compute_params: &compute_params + common: &compute_params_common + compute_hugepages_size: 2M + compute_hugepages_count: 5120 + compute_hugepages_mount: /mnt/hugepages_2M + dpdk: + <<: *compute_params_common + compute_dpdk_driver: uio + compute_ovs_pmd_cpu_mask: "0x6" + compute_ovs_dpdk_socket_mem: "3072" + compute_ovs_dpdk_lcore_mask: "0x8" + compute_ovs_memory_channels: "2" + dpdk0_driver: igb_uio + dpdk0_n_rxq: 2 + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params diff --git a/labs/ericsson/idf-virtual3.yaml b/labs/ericsson/idf-virtual3.yaml new file mode 100644 index 00000000..86d7b3b0 --- /dev/null +++ b/labs/ericsson/idf-virtual3.yaml @@ -0,0 +1,105 @@ +############################################################################## +# Copyright (c) 2018 Ericsson AB, Mirantis Inc., 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 +############################################################################## +--- +### ericsson-virtual3 Installer descriptor file ### + +idf: + version: 0.1 + net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + oob: + interface: 0 + ip-range: ~ + vlan: native + mask: 24 + # All networks (except OOB) are virtual networks managed by `libvirt` + # Interface indexes are based on Fuel installer defaults + admin: + interface: 0 # when used, will be first vnet interface, untagged + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 # when used, will be second vnet interface, untagged + vlan: native + 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: 4 # when used, will be fifth vnet interface, untagged + vlan: native + network: 192.168.20.0 + mask: 24 + private: + interface: 2 # when used, will be third vnet interface, untagged + vlan: 1000-1999 + network: 10.1.0.0 + mask: 24 + public: + interface: 3 # when used, will be fourth vnet interface, untagged + vlan: native + network: 10.16.0.0 + ip-range: 10.16.0.100-10.16.0.254 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.16.0.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: ~ + mgmt: ~ + private: ~ + public: ~ + network: + interface_mtu: 9000 + 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 + # Ordered-list, index should be in sync with interface index in PDF + - 'ens3' + - 'ens4' + - 'ens5' + - 'ens6' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:00:03.0' + - '0000:00:04.0' + - '0000:00:05.0' + - '0000:00:06.0' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + reclass: + node: + - compute_params: &compute_params + common: &compute_params_common + compute_hugepages_size: 2M + compute_hugepages_count: 5120 + compute_hugepages_mount: /mnt/hugepages_2M + dpdk: + <<: *compute_params_common + compute_dpdk_driver: uio + compute_ovs_pmd_cpu_mask: "0x6" + compute_ovs_dpdk_socket_mem: "3072" + compute_ovs_dpdk_lcore_mask: "0x8" + compute_ovs_memory_channels: "2" + dpdk0_driver: igb_uio + dpdk0_n_rxq: 2 + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params diff --git a/labs/ericsson/idf-virtual4.yaml b/labs/ericsson/idf-virtual4.yaml new file mode 100644 index 00000000..6d93173b --- /dev/null +++ b/labs/ericsson/idf-virtual4.yaml @@ -0,0 +1,105 @@ +############################################################################## +# Copyright (c) 2018 Ericsson AB, Mirantis Inc., 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 +############################################################################## +--- +### ericsson-virtual4 Installer descriptor file ### + +idf: + version: 0.1 + net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + oob: + interface: 0 + ip-range: ~ + vlan: native + mask: 24 + # All networks (except OOB) are virtual networks managed by `libvirt` + # Interface indexes are based on Fuel installer defaults + admin: + interface: 0 # when used, will be first vnet interface, untagged + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 # when used, will be second vnet interface, untagged + vlan: native + 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: 4 # when used, will be fifth vnet interface, untagged + vlan: native + network: 192.168.20.0 + mask: 24 + private: + interface: 2 # when used, will be third vnet interface, untagged + vlan: 1000-1999 + network: 10.1.0.0 + mask: 24 + public: + interface: 3 # when used, will be fourth vnet interface, untagged + vlan: native + network: 10.16.0.0 + ip-range: 10.16.0.100-10.16.0.254 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.16.0.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: ~ + mgmt: ~ + private: ~ + public: ~ + network: + interface_mtu: 9000 + 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 + # Ordered-list, index should be in sync with interface index in PDF + - 'ens3' + - 'ens4' + - 'ens5' + - 'ens6' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:00:03.0' + - '0000:00:04.0' + - '0000:00:05.0' + - '0000:00:06.0' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + reclass: + node: + - compute_params: &compute_params + common: &compute_params_common + compute_hugepages_size: 2M + compute_hugepages_count: 5120 + compute_hugepages_mount: /mnt/hugepages_2M + dpdk: + <<: *compute_params_common + compute_dpdk_driver: uio + compute_ovs_pmd_cpu_mask: "0x6" + compute_ovs_dpdk_socket_mem: "3072" + compute_ovs_dpdk_lcore_mask: "0x8" + compute_ovs_memory_channels: "2" + dpdk0_driver: igb_uio + dpdk0_n_rxq: 2 + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params diff --git a/labs/ericsson/idf-virtual5.yaml b/labs/ericsson/idf-virtual5.yaml new file mode 100644 index 00000000..3d6a366a --- /dev/null +++ b/labs/ericsson/idf-virtual5.yaml @@ -0,0 +1,105 @@ +############################################################################## +# Copyright (c) 2018 Ericsson AB, Mirantis Inc., 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 +############################################################################## +--- +### ericsson-virtual5 Installer descriptor file ### + +idf: + version: 0.1 + net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + oob: + interface: 0 + ip-range: ~ + vlan: native + mask: 24 + # All networks (except OOB) are virtual networks managed by `libvirt` + # Interface indexes are based on Fuel installer defaults + admin: + interface: 0 # when used, will be first vnet interface, untagged + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 # when used, will be second vnet interface, untagged + vlan: native + 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: 4 # when used, will be fifth vnet interface, untagged + vlan: native + network: 192.168.20.0 + mask: 24 + private: + interface: 2 # when used, will be third vnet interface, untagged + vlan: 1000-1999 + network: 10.1.0.0 + mask: 24 + public: + interface: 3 # when used, will be fourth vnet interface, untagged + vlan: native + network: 10.16.0.0 + ip-range: 10.16.0.100-10.16.0.254 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.16.0.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: ~ + mgmt: ~ + private: ~ + public: ~ + network: + interface_mtu: 9000 + 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 + # Ordered-list, index should be in sync with interface index in PDF + - 'ens3' + - 'ens4' + - 'ens5' + - 'ens6' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:00:03.0' + - '0000:00:04.0' + - '0000:00:05.0' + - '0000:00:06.0' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + reclass: + node: + - compute_params: &compute_params + common: &compute_params_common + compute_hugepages_size: 2M + compute_hugepages_count: 5120 + compute_hugepages_mount: /mnt/hugepages_2M + dpdk: + <<: *compute_params_common + compute_dpdk_driver: uio + compute_ovs_pmd_cpu_mask: "0x6" + compute_ovs_dpdk_socket_mem: "3072" + compute_ovs_dpdk_lcore_mask: "0x8" + compute_ovs_memory_channels: "2" + dpdk0_driver: igb_uio + dpdk0_n_rxq: 2 + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params diff --git a/labs/ericsson/pod1.yaml b/labs/ericsson/pod1.yaml index d8a51556..5059eabf 100644 --- a/labs/ericsson/pod1.yaml +++ b/labs/ericsson/pod1.yaml @@ -210,7 +210,7 @@ nodes: remote_management: <<: *remoteparas address: 172.16.1.19/24 - mac_address: "9C:B6:54:8E:C7:F0" + mac_address: "FC:15:B4:12:97:64" interfaces: - name: 'nic1' speed: 10gb diff --git a/labs/ericsson/pod2.yaml b/labs/ericsson/pod2.yaml index c0aef2c2..5131ff95 100644 --- a/labs/ericsson/pod2.yaml +++ b/labs/ericsson/pod2.yaml @@ -55,156 +55,232 @@ jumphost: SKM7gBBWbUmwjBdGX6aurCiyVGv2] remote_management: <<: *remoteparas - address: 172.16.2.11/24 + address: 172.16.2.11 mac_address: "58:20:B1:01:8A:F2" interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + address: "192.168.122.2" + mac_address: "ec:b1:d7:a1:a1:10" + vlan: native - name: 'nic1' speed: 10gb features: 'dpdk|sriov' - address: 100.64.201.5/24 + address: "172.29.236.10" mac_address: "5c:b9:01:8b:9f:e8" - vlan: 84 + vlan: native - name: 'nic2' speed: 10gb features: 'dpdk|sriov' - address: 100.64.201.5/24 + address: "192.168.122.2" mac_address: "5c:b9:01:8b:9f:e9" vlan: native - name: 'nic3' speed: 10gb features: 'dpdk|sriov' - address: 172.16.0.248/16 + address: "172.29.240.10" mac_address: "5c:b9:01:8b:9f:ec" - vlan: native + vlan: 3010 - name: 'nic4' speed: 10gb features: 'dpdk|sriov' - address: 172.16.0.248/16 + address: "172.29.242.10" mac_address: "5c:b9:01:8b:9f:ed" - vlan: native + vlan: 3010 ############################################################################## nodes: - - name: CI-ERICSSON-POD2-NODE1 + - name: node1 node: *nodeparams disks: *disks remote_management: <<: *remoteparas - address: 172.16.2.12/24 + address: 172.16.2.12 mac_address: "58:20:B1:01:8B:F0" interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a2:44:a0" + address: "192.168.122.3" + vlan: native - name: 'nic1' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:94" + address: "172.29.236.11" + vlan: native - name: 'nic2' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:95" + address: "192.168.122.3" + vlan: native - name: 'nic3' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:80" + address: "172.29.240.11" + vlan: 3010 - name: 'nic4' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:81" + address: "172.29.242.11" + vlan: 3010 ############################################################################ - - name: CI-ERICSSON-POD2-NODE2 + - name: node2 node: *nodeparams disks: *disks remote_management: <<: *remoteparas - address: 172.16.2.13/24 + address: 172.16.2.13 mac_address: "58:20:B1:01:8E:FC" interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a2:44:80" + address: "192.168.122.4" + vlan: native - name: 'nic1' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:30" + address: "172.29.236.12" + vlan: native - name: 'nic2' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:31" + address: "192.168.122.4" + vlan: native - name: 'nic3' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:99:64" + address: "172.29.240.12" + vlan: 3010 - name: 'nic4' speed: 10gb features: 'dpdk|sriov' - mac_address: "5c:b9:01:8b:99:65" # second port, no connection + mac_address: "5c:b9:01:8b:99:65" + address: "172.29.242.12" + vlan: 3010 ############################################################################ - - name: CI-ERICSSON-POD2-NODE3 + - name: node3 node: *nodeparams disks: *disks remote_management: <<: *remoteparas - address: 172.16.2.14/24 + address: 172.16.2.14 mac_address: "58:20:B1:01:8D:32" interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a2:43:c0" + address: "192.168.122.5" + vlan: native - name: 'nic1' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:9d:4c" + address: "172.29.236.13" + vlan: native - name: 'nic2' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:9d:4d" + address: "192.168.122.5" + vlan: native - name: 'nic3' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:9d:6c" + address: "172.29.240.13" + vlan: 3010 - name: 'nic4' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:9d:6d" + address: "172.29.242.13" + vlan: 3010 ############################################################################ - - name: CI-ERICSSON-POD2-NODE4 + - name: node4 node: *nodeparams disks: *disks remote_management: <<: *remoteparas - address: 172.16.2.15/24 + address: 172.16.2.15 mac_address: "58:20:B1:01:8B:FC" interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a1:8b:d0" + address: "192.168.122.6" + vlan: native - name: 'nic1' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a5:fc" + address: "172.29.236.14" + vlan: native - name: 'nic2' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a5:fd" + address: "192.168.122.6" + vlan: native - name: 'nic3' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:08" + address: "172.29.240.14" + vlan: 3010 - name: 'nic4' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:09" + address: "172.29.242.14" + vlan: 3010 ############################################################################ - - name: CI-ERICSSON-POD2-NODE5 + - name: node5 node: *nodeparams disks: *disks remote_management: <<: *remoteparas - address: 172.16.2.16/24 + address: 172.16.2.16 mac_address: "58:20:B1:01:8F:EA" interfaces: + - name: 'nic0' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "ec:b1:d7:a1:bd:60" + address: "192.168.122.7" + vlan: native - name: 'nic1' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:e8" + address: "172.29.236.15" + vlan: native - name: 'nic2' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:a6:e9" + address: "192.168.122.7" + vlan: native - name: 'nic3' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:97:14" + address: "172.29.240.15" + vlan: 3010 - name: 'nic4' speed: 10gb features: 'dpdk|sriov' mac_address: "5c:b9:01:8b:97:15" + address: "172.29.242.15" + vlan: 3010 diff --git a/labs/ericsson/virtual-pod1bl01.yaml b/labs/ericsson/virtual-pod1bl01.yaml new file mode 100644 index 00000000..e565d54e --- /dev/null +++ b/labs/ericsson/virtual-pod1bl01.yaml @@ -0,0 +1,170 @@ +############################################################################## +# Copyright (c) 2018 Ericsson AB, Mirantis Inc., 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 +############################################################################## +--- +### ericsson-virtual-pod1bl01 POD descriptor file ### + +version: 1.0 +details: + pod_owner: Dianfeng Du + contact: dianfeng.du@ericsson.com + lab: Ericsson + location: Rosersberg, Sweden + type: production + link: https://wiki.opnfv.org/display/pharos/Ericsson+Hosting +############################################################################## +jumphost: + name: ericsson-virtual-pod1bl01 + node: &jumpparams + type: baremetal + vendor: HP + model: ProLiant BL460c Gen8 + arch: x86_64 + cpus: 2 + cpu_cflags: ivybridge + cores: 10 + memory: 64G + disks: + - name: 'disk1' + disk_capacity: 800G + disk_type: hdd + disk_interface: scsi + disk_rotation: &diskrotation 15000 + os: ubuntu-16.04 + remote_params: &remoteparas + type: ipmi + versions: + - 1.0 + - 2.0 + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEALPkR/vkbjmLE/rA1i7SP1IOyHTrfwu9GvoqB + 0FyW7YTsN0aJAzoxkV7MG5qCEV6c6HQvwzXIlhPHkdQ24bAR4VRlOM+fpLnf + Rfex4/XpdT+tpV6maluefRBL4FSeac9B6XQ3ALwx019DPtILEJJ0ueUippXO + eR2Nkx5aEF9T97vLxvgUyRoAHQ26TMkUDMu+VjKO/zgYZoi8usn8mqdXLDie + jOeeDX/R2vF6bMOxjkda4FnNAJz0iennuV06IgyB5cnKY0K4sqRkH5418GV+ + J+l5YELcTPtDaoNFDRdJgBQi2D8QFn00FX+bX1pqVzNktPrRBB3BKBeyjdIJ + Fx+m7jA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBaStL9eL/te0mPFTBJ + BaldgBD3BywLaQZpEPZKKZwR+1Hl] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAC/FDzRD/3jWyEuFNmQ2eXZff46rvKr9DrSn5 + yaLdOaSWLsoxYljwCzagzgtjr37VkjizZlRcwf/yXcDTTIGASUFCkZM8P2LS + OksmEBZS2JlaTSCmkEp3vu494/7NWtAHs74cxGOybt5LhyEwMFRL0etrY/6h + Y2UWwD/oRv0axH8SNUS+QMOuEDaTbDTl7iOwAbP90qkttZD6tUUb0obnVUh9 + UAhbrUfO8CcRYvtWOyF9SmRaL0vfoirczWL68TwrVSyEsJ0mrZO5xgKtPmDD + KGCTSr3R09fR3QnVq3Y0ysw62cFx2tJ5M88sHbU3PZMEzUwK6PyxZYcAHC4j + jdBQ8DA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA51b+Wam6rkCgCqXEC + WA0ugBBPILXqYWqCvFANFX+cFj5q] + remote_management: + <<: *remoteparas + address: 172.16.1.11/24 + mac_address: "14:58:D0:5D:AB:47" + interfaces: + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + address: 100.64.215.10/24 + mac_address: "38:ea:a7:17:6a:34" + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:17:6a:35" + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:17:6a:c4" + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:17:6a:c5" + - name: 'nic5' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "14:58:D0:54:7A:D8" + - name: 'nic6' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "14:58:D0:54:7A:DC" +############################################################################## +nodes: + - name: node-1 + node: &nodeparams + <<: *jumpparams + # Fuel overrides certain params (e.g. cpus, mem) based on node role later + type: virtual + vendor: libvirt + model: virt + cpus: 1 + cores: 4 + memory: 6G + disks: &disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + remote_management: &remotemgmt + type: libvirt + user: changeme + pass: changeme + address: 'qemu:///system' + interfaces: &interfaces + - name: 'nic1' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt + vlan: native + - name: 'nic2' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic3' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic4' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + ############################################################################ + - name: node-2 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-3 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-4 + node: *nodeparams + disks: &compute_disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + - name: 'disk2' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-5 + node: *nodeparams + disks: *compute_disks + remote_management: *remotemgmt + interfaces: *interfaces diff --git a/labs/ericsson/virtual1.yaml b/labs/ericsson/virtual1.yaml new file mode 100644 index 00000000..57f855bc --- /dev/null +++ b/labs/ericsson/virtual1.yaml @@ -0,0 +1,170 @@ +############################################################################## +# Copyright (c) 2018 Ericsson AB, Mirantis Inc., 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 +############################################################################## +--- +### ericsson-virtual1 POD descriptor file ### + +version: 1.0 +details: + pod_owner: Dianfeng Du + contact: dianfeng.du@ericsson.com + lab: Ericsson + location: Rosersberg, Sweden + type: production + link: https://wiki.opnfv.org/display/pharos/Ericsson+Hosting +############################################################################## +jumphost: + name: ericsson-virtual1 + node: &jumpparams + type: baremetal + vendor: HP + model: ProLiant BL460c Gen8 + arch: x86_64 + cpus: 2 + cpu_cflags: ivybridge + cores: 10 + memory: 64G + disks: + - name: 'disk1' + disk_capacity: 800G + disk_type: hdd + disk_interface: scsi + disk_rotation: &diskrotation 15000 + os: ubuntu-16.04 + remote_params: &remoteparas + type: ipmi + versions: + - 1.0 + - 2.0 + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAAs3kLIVkEqhUWd/pfTCGlq2uau+dzvox/HXY + G6ccXNZfwFV1mV1z7S0Bg5NME/xF2PU4sUkk9wbK/+yYG8CF6tHCzJMIy6wO + fOfW5rzmM56GFRqsc0rr5qAVpRrOVNiLjiheAwmyVzfRWq0efLayflg3pnZm + j4Z1Uad9YVPeovD8zYsnNWQktaIKwX1TBAg9awZ7dRX43tJthwRNSBU+t3XJ + wiMtbJIOeLKpCQ+DoQ//was7juO82oZXcAz/ds7Ec1/8Vh4qB2XcURzgM7tJ + Gj5U2OXC0pCvH9PKih93OTIGqlboyOn7kqLXN1cIdd+I/OoO/lLpjyCsLmDP + GZhoXDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBQUeVPp2xAdVKUvwCg + B9rcgBC8DoeAeBhrJ/KJmCPVjSF+] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAQSVWy2cbhjfPeMfXjsrOMyvjDSCQY3Xj+DvK + bp1uBqYbgoJXjaLcU/OVTrJqUTC6aA7CZuFeXbqcc+xay2gznXju2o+gB/wk + wNo0p6bfLsGbqDgO1NIGm6KHX2sHsgFUxmOZB3K63PrNEdQRdK0F0rxg9es8 + am0sHEdeteG91rVgHj1FyEaSH1R5xC5Rm4l/AIcGTnhPtGi9gDVdik/zHUh1 + mDDwwIxlhsFCK7B8BJxIXnQe+KdaRRbbdusDafoOgQMpefmNxusr4ljaX0vp + 7WXFtikERCUy6MCZKU55tSTu6sMeSO44tw419EKGEhsAnELIxWoYKiUnM/vB + a3XIujA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBLLgA3biEw8bloqg38 + m+WpgBBgGzF7DTMsUBVS+pa2DUbI] + remote_management: + <<: *remoteparas + address: 172.16.1.22/24 + mac_address: "9C:B6:54:8E:D7:80" + interfaces: + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + address: 100.64.202.5/24 + mac_address: "38:ea:a7:8e:16:c8" + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:8e:16:c9" + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:8e:17:e4" + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:8e:17:e5" + - name: 'nic5' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "9C:B6:54:89:BD:18" + - name: 'nic6' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "9C:B6:54:89:BD:1C" +############################################################################## +nodes: + - name: node-1 + node: &nodeparams + <<: *jumpparams + # Fuel overrides certain params (e.g. cpus, mem) based on node role later + type: virtual + vendor: libvirt + model: virt + cpus: 1 + cores: 4 + memory: 6G + disks: &disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + remote_management: &remotemgmt + type: libvirt + user: changeme + pass: changeme + address: 'qemu:///system' + interfaces: &interfaces + - name: 'nic1' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt + vlan: native + - name: 'nic2' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic3' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic4' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + ############################################################################ + - name: node-2 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-3 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-4 + node: *nodeparams + disks: &compute_disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + - name: 'disk2' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-5 + node: *nodeparams + disks: *compute_disks + remote_management: *remotemgmt + interfaces: *interfaces diff --git a/labs/ericsson/virtual2.yaml b/labs/ericsson/virtual2.yaml new file mode 100644 index 00000000..cab58ee4 --- /dev/null +++ b/labs/ericsson/virtual2.yaml @@ -0,0 +1,170 @@ +############################################################################## +# Copyright (c) 2018 Ericsson AB, Mirantis Inc., 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 +############################################################################## +--- +### ericsson-virtual2 POD descriptor file ### + +version: 1.0 +details: + pod_owner: Dianfeng Du + contact: dianfeng.du@ericsson.com + lab: Ericsson + location: Rosersberg, Sweden + type: production + link: https://wiki.opnfv.org/display/pharos/Ericsson+Hosting +############################################################################## +jumphost: + name: ericsson-virtual2 + node: &jumpparams + type: baremetal + vendor: HP + model: ProLiant BL460c Gen8 + arch: x86_64 + cpus: 2 + cpu_cflags: ivybridge + cores: 10 + memory: 64G + disks: + - name: 'disk1' + disk_capacity: 800G + disk_type: hdd + disk_interface: scsi + disk_rotation: &diskrotation 15000 + os: ubuntu-16.04 + remote_params: &remoteparas + type: ipmi + versions: + - 1.0 + - 2.0 + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAAroWc9yjyHzrNX53MKycctdvYntD/EQoA6x6 + hOFcyQZp8Kkeu164EZ3XxFN2uJ59oSj4YRXXGamEe7CBDZn+QugArGc2tt3h + Ujsad9FW9WRBO+AqF2ZrWBA5bj0ArflnBBsdLQywNrnDnco4H7XbTTl5MtTQ + XJllUBve9Jly918mHA86Dsi3BlOn/M3iE8TeOWcQ8Ip83mgq1MlIERr0kIy9 + pVpsi87Xap+Sxebc83dn8BsZ6vl01QLLoPRAqgOtkrjvDp09XLB2MGZaOx7t + fEtJcdauRXjL/pnw4lqxaIK9TLoPewzVK7u5joOiTGGD6wtyd6/G4z2ujcQJ + bU2ZiDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBQVQ9dnzBdnwa1m2Kr + bmESgBC2/rlVIctf0KcSFZE9xFY1] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAceABHBxWIAfLtPeNf3a5RCbjgoIm34Rgbfh4 + 9Ch272ahZpT4USuoxG1jMTCMA+dukSlsMo04cK6j1g6Epupszr1qGCJYpg2E + OENsC1GLokWPufe2rskUF7gZxd1XoUBq7J+ga7Grz167MAOez0aE3AgftadQ + 8I3QNI/YX8q4s6xWZxe7r2gF+iFVaRatS0yUgex0rX9qOcG7VTNGc+vPKfIQ + XRF/xJi1nkmxde3haHYirXHHUbXHnm2/WrDYrALTLPGPU0W+BTUs4F4lfhDb + n1Vx94NtV+u43luxIRSkekaZCuH+/s/poxqu8jButheEqEZMfZ34vu0vdKMK + iXyUBDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDBOx/+ZJsIIcMMefgU + xK/6gBBorR0SDEFAyb4p0pd7SfnD] + remote_management: + <<: *remoteparas + address: 172.16.1.23/24 + mac_address: "9C:B6:54:8E:B7:09" + interfaces: + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + address: 100.64.203.5/24 + mac_address: "38:ea:a7:8f:53:74" + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:8f:53:75" + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:8f:53:6c" + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:8f:53:6d" + - name: 'nic5' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "9C:B6:54:8A:04:C8" + - name: 'nic6' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "9C:B6:54:8A:04:CC" +############################################################################## +nodes: + - name: node-1 + node: &nodeparams + <<: *jumpparams + # Fuel overrides certain params (e.g. cpus, mem) based on node role later + type: virtual + vendor: libvirt + model: virt + cpus: 1 + cores: 4 + memory: 6G + disks: &disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + remote_management: &remotemgmt + type: libvirt + user: changeme + pass: changeme + address: 'qemu:///system' + interfaces: &interfaces + - name: 'nic1' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt + vlan: native + - name: 'nic2' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic3' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic4' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + ############################################################################ + - name: node-2 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-3 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-4 + node: *nodeparams + disks: &compute_disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + - name: 'disk2' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-5 + node: *nodeparams + disks: *compute_disks + remote_management: *remotemgmt + interfaces: *interfaces diff --git a/labs/ericsson/virtual3.yaml b/labs/ericsson/virtual3.yaml new file mode 100644 index 00000000..d4011712 --- /dev/null +++ b/labs/ericsson/virtual3.yaml @@ -0,0 +1,170 @@ +############################################################################## +# Copyright (c) 2018 Ericsson AB, Mirantis Inc., 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 +############################################################################## +--- +### ericsson-virtual3 POD descriptor file ### + +version: 1.0 +details: + pod_owner: Dianfeng Du + contact: dianfeng.du@ericsson.com + lab: Ericsson + location: Rosersberg, Sweden + type: production + link: https://wiki.opnfv.org/display/pharos/Ericsson+Hosting +############################################################################## +jumphost: + name: ericsson-virtual3 + node: &jumpparams + type: baremetal + vendor: HP + model: ProLiant BL460c Gen8 + arch: x86_64 + cpus: 2 + cpu_cflags: ivybridge + cores: 10 + memory: 64G + disks: + - name: 'disk1' + disk_capacity: 800G + disk_type: hdd + disk_interface: scsi + disk_rotation: &diskrotation 15000 + os: ubuntu-16.04 + remote_params: &remoteparas + type: ipmi + versions: + - 1.0 + - 2.0 + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAW9xsuZIaMrtyFNX+kmgZ6G5TV2W/Yrnh0rB9 + JC17tjEQSlHD9G1VaIqFWInlBf3AVZuLBE6DJBNK8nIxurR0AUAvs5+t9WZD + RhNF9uEFFdX038gK56otTluDijjoIrwSOZvqPc/cZcxIuadlg01fuKNVmCT9 + /mTeWgyRHryJ/OzuO4OON15U8Ed3ffvdphjs3IHbQlc6ylNWnr1BIvWPuPvH + LtOSxmfivoBPpEHVwsJO92WoeNu3+mps4O+okUFI5ToyPGhUvfO1VdGEDrBg + TgjLixsWrqA8RB1Nf1C2du1dIulv82IMlq0qHDJWy4AR+RSwRpOeeWb6O9W0 + 746e9TA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBD6rNLcW8y8NWcxgemu + w/HAgBCFKurNj+4kAytFQ3CG29SM] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEADP87YPoTA+BhT6sgaAVJnpbbBrTCc16luuJw + UvSCPTa54Qq3L/3Q0HVb1PJntVKM4ldU/YaFsczYCzTXFE/XcYVTMEbbIudX + j8l71agdfGTlHn3fA2BQFAAz+GOuMV0eBwBpwiYAeQTd178c1/L7l8HNVEHY + DUPN7xXXog7P/2UR1oo90JZDfB9bv4oirOma2YQUaGEiJZqvs1xAui0ZEYj0 + OGfpDVP9k5nR7tL3J2nDxoOJOBiMpG6+4GpyyxckS3ZSUf7CuT+dAsMX96JS + qzxdMMk12VEHCGf5udI744ARfXP0z0TZy9b1x4bHdO0Xwm5J4I/srX/U4TOX + ylAlFTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAyLCfIpXiYn5L1aJBK + oNJ8gBByECriHR0ou3/1J+aBXSYE] + remote_management: + <<: *remoteparas + address: 172.16.1.24/24 + mac_address: "A4:5D:36:FE:78:D0" + interfaces: + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + address: 100.64.204.5/24 + mac_address: "38:ea:a7:8f:07:0c" + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:8f:07:0d" + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:8e:16:c4" + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:8e:16:c5" + - name: 'nic5' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "9C:B6:54:8A:F0:50" + - name: 'nic6' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "9C:B6:54:8A:F0:54" +############################################################################## +nodes: + - name: node-1 + node: &nodeparams + <<: *jumpparams + # Fuel overrides certain params (e.g. cpus, mem) based on node role later + type: virtual + vendor: libvirt + model: virt + cpus: 1 + cores: 4 + memory: 6G + disks: &disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + remote_management: &remotemgmt + type: libvirt + user: changeme + pass: changeme + address: 'qemu:///system' + interfaces: &interfaces + - name: 'nic1' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt + vlan: native + - name: 'nic2' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic3' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic4' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + ############################################################################ + - name: node-2 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-3 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-4 + node: *nodeparams + disks: &compute_disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + - name: 'disk2' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-5 + node: *nodeparams + disks: *compute_disks + remote_management: *remotemgmt + interfaces: *interfaces diff --git a/labs/ericsson/virtual4.yaml b/labs/ericsson/virtual4.yaml new file mode 100644 index 00000000..effa8610 --- /dev/null +++ b/labs/ericsson/virtual4.yaml @@ -0,0 +1,170 @@ +############################################################################## +# Copyright (c) 2018 Ericsson AB, Mirantis Inc., 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 +############################################################################## +--- +### ericsson-virtual4 POD descriptor file ### + +version: 1.0 +details: + pod_owner: Dianfeng Du + contact: dianfeng.du@ericsson.com + lab: Ericsson + location: Rosersberg, Sweden + type: production + link: https://wiki.opnfv.org/display/pharos/Ericsson+Hosting +############################################################################## +jumphost: + name: ericsson-virtual4 + node: &jumpparams + type: baremetal + vendor: HP + model: ProLiant BL460c Gen8 + arch: x86_64 + cpus: 2 + cpu_cflags: ivybridge + cores: 10 + memory: 64G + disks: + - name: 'disk1' + disk_capacity: 800G + disk_type: hdd + disk_interface: scsi + disk_rotation: &diskrotation 15000 + os: ubuntu-16.04 + remote_params: &remoteparas + type: ipmi + versions: + - 1.0 + - 2.0 + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAFUn+IQZZAIVg12z8+x3O+OZuKI0AVIN7gCZD + Q0PINvtvjRIPbi04ohcyor3PSqsrXt9CMRidAoXUYVrYZGyZvJ+bMQrR3Y2x + IFYGpfz3CSxx/faibTd0aSAJ2Ygix34tTjImpJttS6d7tDhLGdzqflnuK5wv + cLSuwDmMe5PLLOsvFF2NqAhBb5gdcYUNY409Fdo9r8COzw/H98OgPkus5ioR + ojfgpkmSWuFySVBtU7g2ytzUpHStUOwfjnAGhEq/kaPcm7GmfKxDK9dY/lNb + NoG/G1GcFE2OvnmwOYDxYZR4Nh2qFzF1Tvv6lygni+rlulKmnAxlvekeHnFR + ChhPJTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAyuGVpeDkIKR1f+ShE + eSumgBAPyTlU4OKeQ1zT8ppewA+k] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAmcwE28BvEB7SWKN9wPOCn3jeG+nf5kO4eHN2 + sViK+cUouSbORPgRA3GWXNz3q4GPAOj7oi6t6zZiApOnNqQWVh+813XOi36R + IsXNmx5os5gefOoQC5dZYs3RhiBOOOYMadn6Z89qdNrDaKQX5hhuZJeerMX4 + 6oUEPhApfpuAH7rCoGav6hb+cpKe0Qfd76M62TiCJmID5v4e7mK7lnr/ELdA + PLMdTL8ckiMQxFNfcp4lfyhAFop1t+g231J9+D5Y6i5Vrteq70RYdhN1EcRV + ZMVRO8d8jc90a669aMaZDnSZWO1QgrQe2EpgnM2zWdjLx26F8E9Qb0Wy72Rk + UP9c3TA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBClcUWaTi1pHCq78qjw + gKFJgBD4aofV/0UYFmnfqikTPEYe] + remote_management: + <<: *remoteparas + address: 172.16.1.25/24 + mac_address: "9C:B6:54:8E:D7:0D" + interfaces: + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:8f:07:58" + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:8f:07:59" + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + address: 100.64.205.5/24 + mac_address: "38:ea:a7:8d:e6:f8" + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "38:ea:a7:8d:e6:f9" + - name: 'nic5' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "9C:B6:54:8A:25:C0" + - name: 'nic6' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "9C:B6:54:8A:25:C4" +############################################################################## +nodes: + - name: node-1 + node: &nodeparams + <<: *jumpparams + # Fuel overrides certain params (e.g. cpus, mem) based on node role later + type: virtual + vendor: libvirt + model: virt + cpus: 1 + cores: 4 + memory: 6G + disks: &disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + remote_management: &remotemgmt + type: libvirt + user: changeme + pass: changeme + address: 'qemu:///system' + interfaces: &interfaces + - name: 'nic1' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt + vlan: native + - name: 'nic2' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic3' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic4' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + ############################################################################ + - name: node-2 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-3 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-4 + node: *nodeparams + disks: &compute_disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + - name: 'disk2' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-5 + node: *nodeparams + disks: *compute_disks + remote_management: *remotemgmt + interfaces: *interfaces diff --git a/labs/ericsson/virtual5.yaml b/labs/ericsson/virtual5.yaml new file mode 100644 index 00000000..b49d6e87 --- /dev/null +++ b/labs/ericsson/virtual5.yaml @@ -0,0 +1,162 @@ +############################################################################## +# Copyright (c) 2018 Ericsson AB, Mirantis Inc., 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 +############################################################################## +--- +### ericsson-virtual5 POD descriptor file ### + +version: 1.0 +details: + pod_owner: Dianfeng Du + contact: dianfeng.du@ericsson.com + lab: Ericsson + location: Rosersberg, Sweden + type: production + link: https://wiki.opnfv.org/display/pharos/Ericsson+Hosting +############################################################################## +jumphost: + name: ericsson-virtual5 + node: &jumpparams + type: baremetal + vendor: HP + model: ProLiant BL460c Gen9 + arch: x86_64 + cpus: 2 + cpu_cflags: haswell + cores: 12 + memory: 128G + disks: + - name: 'disk1' + disk_capacity: 1200G + disk_type: hdd + disk_interface: scsi + disk_rotation: &diskrotation 15000 + os: ubuntu-16.04 + remote_params: &remoteparas + type: ipmi + versions: + - 1.0 + - 2.0 + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAFISXqW+J4fwIdnolsHMTtlecdX0jiXpL+PsO + trAO6QViFl96nBuV7TqVc2JKkHwEN7hpwd7EnD/UEHf8Bb1vmfHRdo9NG18w + wtwxpw2hxq66u3wWbe3VYCO11aWJqUgEc+xcR8AHNRXpLpIIU1SeEtHW6pRc + 4P5lQnH4PH/4NDfc2B7i9Snhku/YMB/WXuOoRXmu7/d3ALHj9LPdAPwUe8fa + AZoStmdj17uNl+8i9B0hPHcIt+++PSVDunTlCC23lbL8ZumJl6TqobQHH40Q + O5lPFJQrisqR3fI1m3FNiLHX2iQ+izKxbuPCoeyVeTVCUJzeb9kJfC+NNeb+ + DLx1ozA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCYhkIxgVTaW7bYpvXp + eIn+gBDmBObxaNDpPqa4fF7VbiL/] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEANbnWOLMbgCt8fCT+gYHqSRglnL/cfICb6FMY + oOqw08FEmyi03Im3O/Ct9z7ZnYMuC1tivTo8fVriuVDK9LqGH3riFFkabkax + Z3Qmn9/ej6zeJH93NglmurbN2uyNF4YBThmma8s6esi1RCarj5M+KSZuvTNv + ByMwoAcK2Z+DGNxDO7QFM08pxvzjPU2cpBfvLL1gKweJWFla3kRYu/i/DWM3 + 7y0f6K1R/8CkUeiMqxdlRAIV+iFiQZwFrigLvjr2vN7mh0GtyzmXacP2882b + /XMoy57aSu6wm6Pb/Z8Hr8Yhs+nJKh1btk3Lgvb+UFmCvC46kLmZwHfU5C6+ + yRGugDA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBOffpyurEo1+BNsdXI + HstDgBDpJ5nBblIOUA6lywX0TqSi] + remote_management: + <<: *remoteparas + address: 172.16.2.21/24 + mac_address: "58:20:B1:01:8E:F8" + interfaces: + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + address: 100.64.207.10/24 + mac_address: "5c:b9:01:8b:a6:50" + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:a6:51" + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:99:38" + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "5c:b9:01:8b:99:39" +############################################################################## +nodes: + - name: node-1 + node: &nodeparams + <<: *jumpparams + # Fuel overrides certain params (e.g. cpus, mem) based on node role later + type: virtual + vendor: libvirt + model: virt + cpus: 1 + cores: 4 + memory: 6G + disks: &disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + remote_management: &remotemgmt + type: libvirt + user: changeme + pass: changeme + address: 'qemu:///system' + interfaces: &interfaces + - name: 'nic1' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt + vlan: native + - name: 'nic2' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic3' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic4' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + ############################################################################ + - name: node-2 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-3 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-4 + node: *nodeparams + disks: &compute_disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + - name: 'disk2' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-5 + node: *nodeparams + disks: *compute_disks + remote_management: *remotemgmt + interfaces: *interfaces diff --git a/labs/huawei/idf-pod1.yaml b/labs/huawei/idf-pod1.yaml index 7e2cd721..00933bc4 100644 --- a/labs/huawei/idf-pod1.yaml +++ b/labs/huawei/idf-pod1.yaml @@ -12,7 +12,7 @@ idf: version: 0.1 # NOTE: Fuel checking is disabled until 'idf.fuel' is defined below - installer: ['apex', 'compass4nfv', 'daisy', 'joid'] + installer: ['apex', 'compass4nfv', 'daisy'] net_config: mgmt: interface: 1 diff --git a/labs/intel/idf-pod18.yaml b/labs/intel/idf-pod18.yaml index bd8c49ec..e219e3b9 100644 --- a/labs/intel/idf-pod18.yaml +++ b/labs/intel/idf-pod18.yaml @@ -8,5 +8,96 @@ --- idf: version: 0.1 - # NOTE: Fuel checking is disabled until 'idf.fuel' is defined below - installer: ['apex', 'compass4nfv', 'daisy', 'joid'] + installer: ['joid', 'fuel'] + net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + oob: + interface: 0 + ip-range: 10.10.180.10-10.10.180.15 + vlan: native + mask: 24 + admin: # admin + interface: 1 + vlan: native + network: 10.10.181.0 + mask: 24 + bridge: brAdm + mgmt: # data + interface: 2 + vlan: 184 + network: 10.10.184.0 + ip-range: 10.10.184.10-10.10.184.254 + mask: 24 + storage: # storage + interface: 3 + vlan: native + network: 10.10.183.0 + mask: 24 + private: # floating + interface: 2 + vlan: 1000-1030 + network: 10.10.182.0 + mask: 24 + bridge: brExt + public: # public + interface: 3 + vlan: 1183 + network: 10.10.185.0 + ip-range: 10.10.185.100-10.10.185.253 + mask: 24 + gateway: 10.10.185.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: 'brAdm' + mgmt: 'mgmt18_br0' + private: ~ + public: 'brExt' + maas: + # MaaS timeouts (in minutes) + timeout_comissioning: 10 + timeout_deploying: 15 + network: + ntp_strata_host1: 1.pool.ntp.org + ntp_strata_host2: 0.pool.ntp.org + node: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: &interfaces + # Ordered-list, index should be in sync with interface index in PDF + - 'eno1' + - 'eno2' + - 'ens785f0' + - 'ens785f1' + - 'ens785f2' + - 'ens785f3' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:03:00.0' + - '0000:03:00.3' + - '0000:05:00.0' + - '0000:05:00.1' + - '0000:05:00.2' + - '0000:05:00.3' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: + - 'eno1' + - 'enp3s0f3' + - 'ens785f0' + - 'ens785f1' + - 'ens785f2' + - 'ens785f3' + busaddr: + - '0000:03:00.0' + - '0000:03:00.3' + - '0000:05:00.0' + - '0000:05:00.1' + - '0000:05:00.2' + - '0000:05:00.3' diff --git a/labs/intel/pod18.yaml b/labs/intel/pod18.yaml index 24c14fda..73ab232d 100644 --- a/labs/intel/pod18.yaml +++ b/labs/intel/pod18.yaml @@ -33,27 +33,31 @@ jumphost: disk_type: hdd disk_interface: sas disk_rotation: 15000 - os: centos-7.2.1611 + os: ubuntu-16.04 remote_params: &remoteparas type: ipmi versions: - 1.0 - 2.0 - user: changeme - pass: changeme + user: root + pass: root remote_management: <<: *remoteparas address: 10.10.180.10 mac_address: "A4:BF:01:16:31:98" interfaces: - name: 'nic1' - address: 10.10.180.20/24 + address: 10.10.180.20 mac_address: "A4:BF:01:16:31:96" vlan: native - name: 'nic2' - address: 10.10.181.20/24 + address: 10.10.182.20 mac_address: "A4:BF:01:16:31:97" vlan: native + - name: 'nic3' + address: 10.10.181.20 + mac_address: "3c:fd:fe:a4:9c:f1" + vlan: native nodes: - name: pod18-node1 node: &nodeparas @@ -78,43 +82,43 @@ nodes: disk_rotation: 15000 remote_management: <<: *remoteparas - address: 10.10.180.11/24 + address: 10.10.180.11 mac_address: "A4:BF:01:14:40:18" interfaces: - name: 'nic1' speed: 1gb features: - address: 10.10.180.21/24 + address: 10.10.180.21 mac_address: "A4:BF:01:14:40:16" vlan: native - name: 'nic2' speed: 1gb features: - address: 10.10.181.21/24 + address: 10.10.181.21 mac_address: "A4:BF:01:14:40:17" - vlan: native + vlan: 184 - name: 'nic3' speed: 10gb features: 'dpdk|sriov' - address: 10.10.182.21/24 + address: 10.10.182.21 mac_address: "3C:FD:FE:A4:9F:A0" vlan: native - name: 'nic4' speed: 10gb features: 'dpdk|sriov' - address: 10.10.183.21/24 + address: 10.10.183.21 mac_address: "3C:FD:FE:A4:9F:A1" - vlan: native + vlan: 1183 - name: 'nic5' speed: 10gb features: 'dpdk|sriov' - address: 10.10.184.21/24 + address: 10.10.184.21 mac_address: "3C:FD:FE:A4:9F:A2" vlan: native - name: 'nic6' speed: 10gb features: 'dpdk|sriov' - address: 10.10.185.21/24 + address: 10.10.185.21 mac_address: "3C:FD:FE:A4:9F:A3" vlan: native - name: pod18-node2 @@ -122,43 +126,43 @@ nodes: disks: *disks remote_management: <<: *remoteparas - address: 10.10.180.12/24 + address: 10.10.180.12 mac_address: "A4:BF:01:16:31:1F" interfaces: - name: 'nic1' speed: 1gb features: - address: 10.10.180.22/24 + address: 10.10.180.22 mac_address: "A4:BF:01:16:31:1E" vlan: native - name: 'nic2' speed: 1gb features: - address: 10.10.181.22/24 + address: 10.10.181.22 mac_address: "A4:BF:01:16:31:1F" - vlan: native + vlan: 184 - name: 'nic3' speed: 10gb features: 'dpdk|sriov' - address: 10.10.182.22/24 + address: 10.10.182.22 mac_address: "3C:FD:FE:A4:A0:30" vlan: native - name: 'nic4' speed: 10gb features: 'dpdk|sriov' - address: 10.10.183.22/24 + address: 10.10.183.22 mac_address: "3C:FD:FE:A4:A0:31" - vlan: native + vlan: 1183 - name: 'nic5' speed: 10gb features: 'dpdk|sriov' - address: 10.10.184.22/24 + address: 10.10.184.22 mac_address: "3C:FD:FE:A4:A0:32" vlan: native - name: 'nic6' speed: 10gb features: 'dpdk|sriov' - address: 10.10.185.22/24 + address: 10.10.185.22 mac_address: "3C:FD:FE:A4:A0:33" vlan: native - name: pod18-node3 @@ -166,43 +170,43 @@ nodes: disks: *disks remote_management: <<: *remoteparas - address: 10.10.180.13/24 + address: 10.10.180.13 mac_address: "A4:BF:01:16:30:F8" interfaces: - name: 'nic1' speed: 1gb features: - address: 10.10.180.23/24 + address: 10.10.180.23 mac_address: "A4:BF:01:16:30:F6" vlan: native - name: 'nic2' speed: 1gb features: - address: 10.10.181.23/24 + address: 10.10.181.23 mac_address: "A4:BF:01:16:30:F7" - vlan: native + vlan: 184 - name: 'nic3' speed: 10gb features: 'dpdk|sriov' - address: 10.10.182.23/24 + address: 10.10.182.23 mac_address: "3C:FD:FE:A4:9E:48" vlan: native - name: 'nic4' speed: 10gb features: 'dpdk|sriov' - address: 10.10.183.23/24 + address: 10.10.183.23 mac_address: "3C:FD:FE:A4:9E:49" - vlan: native + vlan: 1183 - name: 'nic5' speed: 10gb features: 'dpdk|sriov' - address: 10.10.184.23/24 + address: 10.10.184.23 mac_address: "3C:FD:FE:A4:9E:4A" vlan: native - name: 'nic6' speed: 10gb features: 'dpdk|sriov' - address: 10.10.185.23/24 + address: 10.10.185.23 mac_address: "3C:FD:FE:A4:9E:4B" vlan: native - name: pod18-node4 @@ -210,43 +214,43 @@ nodes: disks: *disks remote_management: <<: *remoteparas - address: 10.10.180.14/24 + address: 10.10.180.14 mac_address: "A4:BF:01:14:72:0F" interfaces: - name: 'nic1' speed: 1gb features: - address: 10.10.180.24/24 + address: 10.10.180.24 mac_address: "A4:BF:01:14:72:0D" vlan: native - name: 'nic2' speed: 1gb features: - address: 10.10.181.24/24 + address: 10.10.181.24 mac_address: "A4:BF:01:14:72:0E" - vlan: native + vlan: 184 - name: 'nic3' speed: 10gb features: 'dpdk|sriov' - address: 10.10.182.24/24 + address: 10.10.182.24 mac_address: "3C:FD:FE:A4:9D:E8" vlan: native - name: 'nic4' speed: 10gb features: 'dpdk|sriov' - address: 10.10.183.24/24 + address: 10.10.183.24 mac_address: "3C:FD:FE:A4:9D:E9" - vlan: native + vlan: 1183 - name: 'nic5' speed: 10gb features: 'dpdk|sriov' - address: 10.10.184.24/24 + address: 10.10.184.24 mac_address: "3C:FD:FE:A4:9D:EA" vlan: native - name: 'nic6' speed: 10gb features: 'dpdk|sriov' - address: 10.10.185.24/24 + address: 10.10.185.24 mac_address: "3C:FD:FE:A4:9D:EB" vlan: native - name: pod18-node5 @@ -254,42 +258,42 @@ nodes: disks: *disks remote_management: <<: *remoteparas - address: 10.10.180.15/24 + address: 10.10.180.15 mac_address: "A4:BF:01:14:71:70" interfaces: - name: 'nic1' speed: 1gb features: - address: 10.10.180.25/24 + address: 10.10.180.25 mac_address: "A4:BF:01:14:71:68" vlan: native - name: 'nic2' speed: 1gb features: - address: 10.10.181.25/24 + address: 10.10.181.25 mac_address: "A4:BF:01:14:71:69" - vlan: native + vlan: 184 - name: 'nic3' speed: 10gb features: 'dpdk|sriov' - address: 10.10.182.25/24 + address: 10.10.182.25 mac_address: "3C:FD:FE:A4:A1:08" vlan: native - name: 'nic4' speed: 10gb features: 'dpdk|sriov' - address: 10.10.183.25/24 + address: 10.10.183.25 mac_address: "3C:FD:FE:A4:A1:09" - vlan: native + vlan: 1183 - name: 'nic5' speed: 10gb features: 'dpdk|sriov' - address: 10.10.184.25/24 + address: 10.10.184.25 mac_address: "3C:FD:FE:A4:A1:0A" vlan: native - name: 'nic6' speed: 10gb features: 'dpdk|sriov' - address: 10.10.185.25/24 + address: 10.10.185.25 mac_address: "3C:FD:FE:A4:A1:0B" vlan: native diff --git a/labs/itri/idf-pod1.yaml b/labs/itri/idf-pod1.yaml new file mode 100644 index 00000000..f88a913f --- /dev/null +++ b/labs/itri/idf-pod1.yaml @@ -0,0 +1,92 @@ +############################################################################## +# Copyright (c) 2019 ITRI. +# 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 +############################################################################## +--- +### ITRI POD 1 installer descriptor file ### + +idf: + version: 0.1 + installer: ['compass4nfv', 'fuel'] + net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + admin: + interface: 0 + vlan: native + network: 10.1.0.0 + mask: 24 + storage: + interface: 1 + vlan: native + network: 172.16.2.0 + mask: 24 + oob: + interface: 1 + ip-range: 100.86.5.28-100.86.5.33 + vlan: native + public: + interface: 2 + vlan: native + network: 100.86.0.0 + mask: 16 + gateway: 100.86.0.254 + dns: + - 8.8.8.8 + - 8.8.4.4 + mgmt: + interface: 4 + vlan: 1001 + network: 172.16.3.0 + mask: 24 + private: + interface: 3 + vlan: 100 + network: 172.16.1.0 + mask: 24 + fuel: + jumphost: + bridges: + admin: 'pxebr' + mgmt: 'br-ctl' + private: '' + public: '' + network: + node: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: + # Ordered-list, index should be in sync with interface index in PDF + - 'eth0' + - 'eth1' + - 'eth2' + - 'eth3' + - 'eth4' + busaddr: + # Bus-info reported by `ethtool -i ethX` + - '0000:03:00.0' + - '0000:05:00.3' + - '0000:02:00.1' + - '0000:05:00.0' + - '0000:02:00.0' + - interfaces: &interfaces + - 'eth0' + - 'eth1' + - 'eth2' + - 'eth3' + - 'eth4' + busaddr: &busaddr + - '0000:03:00.0' + - '0000:04:00.1' + - '0000:02:00.1' + - '0000:05:00.1' + - '0000:02:00.0' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr diff --git a/labs/itri/pod1.yaml b/labs/itri/pod1.yaml new file mode 100644 index 00000000..06140900 --- /dev/null +++ b/labs/itri/pod1.yaml @@ -0,0 +1,295 @@ +############################################################################## +# Copyright (c) 2018 ITRI, Mirantis Inc., 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 +############################################################################## +--- +### ITRI POD 1 descriptor file ### + +version: 1.0 +details: + pod_owner: ITRI + contact: mhhsu@itri.org.tw + lab: ITRI Pharos Lab + location: Taiwan + type: production + link: https://wiki.opnfv.org/display/pharos/Community+Labs +############################################################################## +jumphost: + name: pod1-jump + node: + type: baremetal + vendor: Dell + model: PowerEdge R730 + arch: x86_64 + cpus: 2 + cpu_cflags: Broadwell + cores: 24 + memory: 64G + disks: &disks + - name: 'disk1' + disk_capacity: 480G + disk_type: ssd + disk_interface: ssd + disk_rotation: 0 + - name: 'disk2' + disk_capacity: 480G + disk_type: ssd + disk_interface: ssd + disk_rotation: 0 + - name: 'disk3' + disk_capacity: 480G + disk_type: ssd + disk_interface: ssd + disk_rotation: 0 + - name: 'disk4' + disk_capacity: 480G + disk_type: ssd + disk_interface: ssd + disk_rotation: 0 + - name: 'disk5' + disk_capacity: 1T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + - name: 'disk6' + disk_capacity: 1T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + - name: 'disk7' + disk_capacity: 1T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + - name: 'disk8' + disk_capacity: 1T + 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: 100.86.5.23 + mac_address: "10:98:36:b5:6f:79" + interfaces: + - mac_address: "52:54:00:7c:d6:b4" + speed: 1gb + features: 'dpdk|sriov' + address: 10.1.0.1 + name: 'nic1' +############################################################################## +nodes: + - name: pod1-node1 + node: &nodeparams + type: baremetal + vendor: Dell + model: PowerEdge R730 + arch: x86_64 + cpus: 2 + cpu_cflags: Broadwell + cores: 24 + memory: 128G + disks: *disks + remote_management: + <<: *remote_params + address: 100.86.5.28 + mac_address: "18:66:da:a3:f0:99" + interfaces: + - mac_address: "18:66:da:a3:f0:97" + speed: 1gb + features: 'dpdk|sriov' + address: 10.1.0.50 + name: 'nic1' + - mac_address: "3c:fd:fe:12:29:c6" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.2.1 + name: 'nic2' + - mac_address: "18:66:da:a3:f0:96" + speed: 1gb + features: 'dpdk|sriov' + address: 100.86.88.10 + name: 'nic3' + - mac_address: "3c:fd:fe:12:29:c0" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.1.1 + name: 'nic4' + - mac_address: "18:66:da:a3:f0:95" + speed: 1gb + features: 'dpdk|sriov' + name: 'nic5' + ############################################################################ + - name: pod1-node2 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 100.86.5.29 + mac_address: "18:66:da:a3:f3:c9" + interfaces: + - mac_address: "18:66:da:a3:f3:c7" + speed: 1gb + features: 'dpdk|sriov' + address: 10.1.0.51 + name: 'nic1' + - mac_address: "3c:fd:fe:1a:e0:02" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.2.2 + name: 'nic2' + - mac_address: "18:66:da:a3:f3:c6" + speed: 1gb + features: 'dpdk|sriov' + address: 100.86.88.11 + name: 'nic3' + - mac_address: "3c:fd:fe:12:09:e2" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.1.2 + name: 'nic4' + - mac_address: "18:66:da:a3:f3:c5" + speed: 1gb + features: 'dpdk|sriov' + name: 'nic5' + ############################################################################ + - name: pod1-node3 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 100.86.5.30 + mac_address: "18:66:da:a3:c2:c6" + interfaces: + - mac_address: "18:66:da:a3:c2:c4" + speed: 1gb + features: 'dpdk|sriov' + address: 10.1.0.52 + name: 'nic1' + - mac_address: "3c:fd:fe:1b:23:62" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.2.3 + name: 'nic2' + - mac_address: "18:66:da:a3:c2:c3" + speed: 1gb + features: 'dpdk|sriov' + address: 100.86.88.12 + name: 'nic3' + - mac_address: "3c:fd:fe:12:29:e2" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.1.3 + name: 'nic4' + - mac_address: "18:66:da:a3:c2:c2" + speed: 1gb + features: 'dpdk|sriov' + name: 'nic5' + ############################################################################ + - name: pod1-node4 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 100.86.5.31 + mac_address: "18:66:da:a3:bd:dd" + interfaces: + - mac_address: "18:66:da:a3:bd:db" + speed: 1gb + features: 'dpdk|sriov' + address: 10.1.0.53 + name: 'nic1' + - mac_address: "3c:fd:fe:1a:c6:c2" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.2.4 + name: 'nic2' + - mac_address: "18:66:da:a3:bd:da" + speed: 1gb + features: 'dpdk|sriov' + address: 100.86.88.13 + name: 'nic3' + - mac_address: "3c:fd:fe:12:2b:22" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.1.4 + name: 'nic4' + - mac_address: "18:66:da:a3:bd:d9" + speed: 1gb + features: 'dpdk|sriov' + name: 'nic5' + ############################################################################ + - name: pod1-node5 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 100.86.5.32 + mac_address: "18:66:da:a3:b9:8e" + interfaces: + - mac_address: "18:66:da:a3:b9:8c" + speed: 1gb + features: 'dpdk|sriov' + address: 10.1.0.54 + name: 'nic1' + - mac_address: "3c:fd:fe:1b:22:e2" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.2.5 + name: 'nic2' + - mac_address: "18:66:da:a3:b9:8b" + speed: 1gb + features: 'dpdk|sriov' + address: 100.86.88.14 + name: 'nic3' + - mac_address: "3c:fd:fe:12:29:a2" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.1.5 + name: 'nic4' + - mac_address: "18:66:da:a3:b9:8a" + speed: 1gb + features: 'dpdk|sriov' + name: 'nic5' + ############################################################################ + - name: pod1-node6 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 100.86.5.33 + mac_address: "18:66:da:a3:c7:5b" + interfaces: + - mac_address: "18:66:da:a3:c7:59" + speed: 1gb + features: 'dpdk|sriov' + address: 10.1.0.55 + name: 'nic1' + - mac_address: "3c:fd:fe:1b:00:82" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.2.6 + name: 'nic2' + - mac_address: "18:66:da:a3:c7:58" + speed: 1gb + features: 'dpdk|sriov' + address: 100.86.88.15 + name: 'nic3' + - mac_address: "3c:fd:fe:12:2a:c2" + speed: 10gb + features: 'dpdk|sriov' + address: 172.16.1.6 + name: 'nic4' + - mac_address: "18:66:da:a3:c7:57" + speed: 1gb + features: 'dpdk|sriov' + name: 'nic5' diff --git a/labs/lf/idf-pod2.yaml b/labs/lf/idf-pod2.yaml index b916707a..b54e2ce7 100644 --- a/labs/lf/idf-pod2.yaml +++ b/labs/lf/idf-pod2.yaml @@ -10,12 +10,14 @@ idf: version: 0.1 + installer: ['apex', 'compass4nfv', 'daisy', 'fuel'] net_config: # NOTE: Network names are likely to change after the PDF spec is updated oob: interface: 0 ip-range: 172.30.8.65-172.30.8.75 vlan: 410 + mask: 26 admin: interface: 0 vlan: native @@ -34,7 +36,7 @@ idf: mask: 24 private: interface: 1 - vlan: 1000 + vlan: 1000-1030 network: 10.1.0.0 # Tagged, not the same with 'private' on wiki mask: 24 public: @@ -55,6 +57,8 @@ idf: private: ~ public: ~ network: + ntp_strata_host1: 1.pool.ntp.org + ntp_strata_host2: 0.pool.ntp.org node: # Ordered-list, index should be in sync with node index in PDF - interfaces: &interfaces diff --git a/labs/lf/idf-pod4.yaml b/labs/lf/idf-pod4.yaml index c8f6cf27..c0a1b17e 100644 --- a/labs/lf/idf-pod4.yaml +++ b/labs/lf/idf-pod4.yaml @@ -10,11 +10,13 @@ idf: version: 0.1 + installer: ['apex', 'compass4nfv', 'daisy', 'fuel'] net_config: &net_config oob: interface: 0 ip-range: 172.30.8.83-172.30.8.88 vlan: 410 + mask: 29 admin: interface: 0 vlan: native @@ -47,6 +49,43 @@ idf: - 8.8.8.8 - 8.8.4.4 osa: &idf_osa + nodes_roles: + opnfv: [deployment] + node1: [controller] + node2: [compute, storage] + node3: [compute, storage] + node4: [controller] + node5: [controller] + groups: + openstack: + - controller + - compute + - storage + hostnames: + opnfv: opnfv + node1: controller00 + node2: compute00 + node3: compute01 + node4: controller01 + node5: controller02 + network: + # network mapping + network_mapping: + # Management network used by installer components to communicate + net-mgmt: mgmt + # Storage Network + net-storage: storage + # Internal network for communication between VNF + net-internal: private + # Public network for VNF remote acces (ext-net in Openstack) + net-vnf: public + deployment_host_interfaces: + # Ordered-list, index should be in sync with interface index in PDF + - 'eno1' + - 'eno3.450' + - 'eno3.452' + - 'eno4.451' + - 'eno4.414' fuel: jumphost: bridges: diff --git a/labs/lf/idf-pod5.yaml b/labs/lf/idf-pod5.yaml index c1af4ed8..01778907 100644 --- a/labs/lf/idf-pod5.yaml +++ b/labs/lf/idf-pod5.yaml @@ -10,11 +10,13 @@ idf: version: 0.1 + installer: ['apex', 'compass4nfv', 'daisy', 'fuel'] net_config: oob: interface: 0 ip-range: 172.30.8.89-172.30.8.94 vlan: 410 + mask: 29 admin: interface: 0 vlan: native diff --git a/labs/nokia/idf-pod1.yaml b/labs/nokia/idf-pod1.yaml index 83aba95b..3fc47e20 100644 --- a/labs/nokia/idf-pod1.yaml +++ b/labs/nokia/idf-pod1.yaml @@ -9,4 +9,4 @@ idf: version: 0.1 # NOTE: Fuel checking is disabled until 'idf.fuel' is defined below - installer: ['apex', 'compass4nfv', 'daisy', 'joid'] + installer: ['apex', 'compass4nfv', 'daisy'] diff --git a/labs/ool/idf-pod1.yaml b/labs/ool/idf-pod1.yaml new file mode 100644 index 00000000..d27b0acc --- /dev/null +++ b/labs/ool/idf-pod1.yaml @@ -0,0 +1,66 @@ +############################################################################## +# Copyright (c) 2018 Okinawa Open Labratory. +# 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 +############################################################################## +--- +### This is a OOL Installer descriptor file ### + +idf: + version: 0.1 + # NOTE: Temporarily disable Daisy check, since it requires 'storage' network + # to be defined in 'idf.net_config' below. + installer: ['apex', 'fuel'] + net_config: + admin: + interface: 0 + vlan: native + network: 192.168.103.0 + mask: 24 + mgmt: + interface: 2 + vlan: 101 + network: 192.168.104.0 + mask: 24 + public: + interface: 2 + vlan: 102 + network: 192.168.106.0 + mask: 24 + private: + interface: 1 + vlan: native + network: 192.168.25.0 + mask: 24 + gateway: 192.168.20.254 + dns: + - 8.8.8.8 + fuel: + jumphost: + bridges: + admin: 'br-em1' + mgmt: 'br0' + public: 'br-ex' + private: ~ + network: + node: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: &interfaces + # Ordered-list, index should be in sync with interface index in PDF + - 'eno2' + - 'eno3' + - 'eno4' + busaddr: &busaddr + - '0000:01:00.0' + - '0000:07:00.0' + - '0000:07:00.1' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr diff --git a/labs/ool/pod1.yaml b/labs/ool/pod1.yaml new file mode 100644 index 00000000..befb3ab5 --- /dev/null +++ b/labs/ool/pod1.yaml @@ -0,0 +1,204 @@ +############################################################################## +# Copyright (c) 2018 Okinawa Open Labratory Inc. +# 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 +############################################################################## +--- +### Okinawa Open Labratory POD descriptor file ### +version: 1.0 +details: + pod_owner: Hideayasu Hayashi + contact: opnfv-ool-member@okinawaopenlabs.org + lab: Okinawa Open Lab Testlab + location: Okinawa, Japan + type: development + link: https://wiki.opnfv.org/display/pharos/OOL+Hosting +########################################################### + +jumphost: + name: OPNFV-Jump + node: + type: baremetal + vendor: SuperMicro + model: SYS-5018R-WR + arch: x86_64 + cpus: 1 + cpu_cflags: Haswell + cores: 16 + memory: 32GB + disks: + - name: 'disk1' + disk_capacity: 2TB + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + os: ubuntu-16.04 + remote_params: &remote_params + type: ipmi + versions: + - 1.0 + - 2.0 + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAF2ppKLPzAigPgVqFhC0wnAJPImX04Ql5kKr7 + cq3G8eiDIm4AfTOwW3iJf8srdChaVnseriher6cdietFwr3xoVYe/r1qD/Bp + IrmD79lNrbPMTwA8ESRmroKhxpxvRDziOUc5T9ev942n6BGs0iBjHMl96ZcN + UscPrV6iHtUfEN1ZaEx0kv217vSv5JWUp4gf10ZHJEN12gAxZBuuKRr59dbw + kGtn5QRjEQ1g7PKDTa3HIKUkxN9snPzAIrXtXsG4O/HmUl0UEUlJ4O5/+wBN + kE/a9/OqMs9+KWmFZ1PRw35WIFpk7vS2HI7HfLab3AHKRySBnTAoGIdnqd+I + se5pQzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBXF6x8Rg0xNCGXOUio + 2oqhgBCQ0jBbqpN9e904KFAjRZWA] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEARKDnZBM1SMOd3e/dxlRV21TGiIs5ezpHqG7f + CbKlOim5KW/siiHGN9S5JnTY62CDGLrSgen5Sstk7LzAOPNRJKxf3sjhE2jT + 1AlyQ7TuYYSeyOzgaV0Us5okOP3BcAZwM5Dvb4HLyg2S48Auy7Vx34DpWrTr + yxh6v3VJbLYyD2G5bhU4lHzNfaTifiYoV16lmCD4ZlCfQVqjVcKIqztQUGJ4 + NpoJhjAwE07+M3jQWYNdHKoHBTNqe3ZVT3w5ee80zQHZ8yhwISHYB5RWUwzG + FKGBBBl0LuxXJBGv7KorRso9v5TBB1m9V8Yl+k/4YHrOfeZBkU1kTjQ2WnNx + jbzBQzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBA6Ipn6y8ilwzbgu3Xa + 2N/VgBBn8rx1meQwP0Wc7lYkqn/5] + remote_management: + <<: *remote_params + address: 192.168.25.10 + mac_address: "0c:c4:7a:6c:a2:b2" + interfaces: + - mac_address: "0c:c4:7a:6c:a2:b2" + speed: 1gb + features: null + name: 'nic1' + - mac_address: "0c:c4:7a:6c:a2:b3" + speed: 1gb + features: null + name: 'nic2' + +#################################################### +nodes: + - name: node-9 + node: &nodeparams + type: baremetal + vendor: FUJITSU + model: RX2530 M1 + arch: x86_64 + cpus: 1 + cpu_cflags: Haswell + cores: 16 + memory: 32GB + disks: &disks + - name: 'disk1' + disk_capacity: 2TB + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + - name: 'disk2' + disk_capacity: 100GB + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + remote_management: + <<: *remote_params + address: 192.168.1.20" + mac_address: "90:1b:0e:6b:e8:a8" + interfaces: + - mac_address: "90:1b:0e:6b:e8:a9" + speed: 1gb + features: null + name: 'nic2' + - mac_address: "90:1b:0e:6b:e8:aa" + speed: 1gb + features: null + name: 'nic3' + - mac_address: "90:1b:0e:6b:e8:ab" + speed: 1gb + features: null + name: 'nic4' + + #################################################### + - name: node-10 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.21" + mac_address: "90:1b:0e:6b:e3:00" + interfaces: + - mac_address: "90:1b:0e:6b:e3:01" + speed: 1gb + features: null + name: 'nic2' + - mac_address: "90:1b:0e:6b:e3:02" + speed: 1gb + features: null + name: 'nic3' + - mac_address: "90:1b:0e:6b:e3:03" + speed: 1gb + features: null + name: 'nic4' + + #################################################### + - name: node-11 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.22 + mac_address: "90:1b:0e:6b:e5:b4" + interfaces: + - mac_address: "90:1b:0e:6b:e5:b5" + speed: 1gb + features: null + name: 'nic2' + - mac_address: "90:1b:0e:6b:e5:b6" + speed: 1gb + features: null + name: 'nic3' + - mac_address: "90:1b:0e:6b:e5:b7" + speed: 1gb + features: null + name: 'nic4' + + #################################################### + - name: node-12 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.23 + mac_address: "90:1b:0e:6b:e8:a8" + interfaces: + - mac_address: "90:1b:0e:6b:e8:a9" + speed: 1gb + features: null + name: 'nic2' + - mac_address: "90:1b:0e:6b:e8:aa" + speed: 1gb + features: null + name: 'nic3' + - mac_address: "90:1b:0e:6b:e8:ab" + speed: 1gb + features: null + name: 'nic4' + + #################################################### + - name: node-13 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.24 + mac_address: "90:1b:0e:6b:e3:00" + interfaces: + - mac_address: "90:1b:0e:6b:e3:01" + speed: 1gb + features: null + name: 'nic2' + - mac_address: "90:1b:0e:6b:e3:02" + speed: 1gb + features: null + name: 'nic3' + - mac_address: "90:1b:0e:6b:e3:03" + speed: 1gb + features: null + name: 'nic4' diff --git a/labs/unh/idf-pod1.yaml b/labs/unh/idf-pod1.yaml new file mode 100644 index 00000000..e8a57f0d --- /dev/null +++ b/labs/unh/idf-pod1.yaml @@ -0,0 +1,113 @@ +############################################################################## +# 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 +############################################################################## +--- +### UNH ARM POD installer descriptor file ### + +idf: + version: 0.1 + installer: ['apex', 'compass4nfv', 'daisy', 'fuel'] + net_config: + oob: + ip-range: 10.10.52.10-10.10.52.15 + vlan: native + mask: 29 + admin: + interface: 0 + vlan: native + network: 10.10.53.0 + mask: 24 + mgmt: + interface: 0 + vlan: 55 + 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: 0 + vlan: 56 + network: 10.2.0.0 + mask: 24 + private: + interface: 0 + vlan: 57 + network: 10.1.0.0 + mask: 24 + public: + interface: 0 + vlan: 50 + network: 10.10.50.0 + ip-range: 10.10.50.100-10.10.50.253 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.10.50.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: 'admin1_br0' + mgmt: 'mgmt1_br0' + private: '' + public: 'public1_br0' + maas: + # MaaS timeouts (in minutes) + timeout_comissioning: 15 + timeout_deploying: 25 + network: + ntp_strata_host1: 1.pool.ntp.org + ntp_strata_host2: 0.pool.ntp.org + node: + # Ordered list, index should be in sync with node index in PDF + - interfaces: &interfaces + # Ordered-list + - 'enP2p1s0f1' + - 'enP2p1s0f2' + - 'enP2p1s0f3' + - 'enP2p1s0f4' + - 'enP2p1s0f5' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0002:01:00.1' + - '0002:01:00.2' + - '0002:01:00.3' + - '0002:01:00.4' + - '0002:01:00.5' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + reclass: + node: + - compute_params: &compute_params + common: + nova_cpu_pinning: &nova_cpu_pinning_common "8-47" + compute_hugepages_size: 2M + compute_hugepages_count: 8192 + compute_hugepages_mount: /mnt/hugepages_2M + compute_kernel_isolcpu: *nova_cpu_pinning_common + 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 + 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 + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params diff --git a/labs/unh/idf-virtual1.yaml b/labs/unh/idf-virtual1.yaml new file mode 100644 index 00000000..0ab8353a --- /dev/null +++ b/labs/unh/idf-virtual1.yaml @@ -0,0 +1,105 @@ +############################################################################## +# Copyright (c) 2019 Ericsson AB, Mirantis Inc., 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 +############################################################################## +--- +### unh-virtual1 Installer descriptor file ### + +idf: + version: 0.1 + net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + oob: + interface: 0 + ip-range: ~ + vlan: native + mask: 24 + # All networks (except OOB) are virtual networks managed by `libvirt` + # Interface indexes are based on Fuel installer defaults + admin: + interface: 0 # when used, will be first vnet interface, untagged + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 # when used, will be second vnet interface, untagged + vlan: native + 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: 4 # when used, will be fifth vnet interface, untagged + vlan: native + network: 192.168.20.0 + mask: 24 + private: + interface: 2 # when used, will be third vnet interface, untagged + vlan: 1000-1999 + network: 10.1.0.0 + mask: 24 + public: + interface: 3 # when used, will be fourth vnet interface, untagged + vlan: native + network: 10.16.0.0 + ip-range: 10.16.0.100-10.16.0.254 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.16.0.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: ~ + mgmt: ~ + private: ~ + public: ~ + network: + interface_mtu: 9000 + ntp_strata_host1: 1.pool.ntp.org + ntp_strata_host2: 0.pool.ntp.org + node: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: &interfaces + # Ordered-list, index should be in sync with interface index in PDF + - 'ens3' + - 'ens4' + - 'ens5' + - 'ens6' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:00:03.0' + - '0000:00:04.0' + - '0000:00:05.0' + - '0000:00:06.0' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + reclass: + node: + - compute_params: &compute_params + common: &compute_params_common + compute_hugepages_size: 2M + compute_hugepages_count: 5120 + compute_hugepages_mount: /mnt/hugepages_2M + dpdk: + <<: *compute_params_common + compute_dpdk_driver: uio + compute_ovs_pmd_cpu_mask: "0x6" + compute_ovs_dpdk_socket_mem: "3072" + compute_ovs_dpdk_lcore_mask: "0x8" + compute_ovs_memory_channels: "2" + dpdk0_driver: igb_uio + dpdk0_n_rxq: 2 + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params + - compute_params: *compute_params diff --git a/labs/unh/pod1.yaml b/labs/unh/pod1.yaml new file mode 100644 index 00000000..0932b58e --- /dev/null +++ b/labs/unh/pod1.yaml @@ -0,0 +1,268 @@ +############################################################################## +# 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 +############################################################################## +--- +### UNH ARM POD 1 descriptor file ### + +version: 1.0 +details: + pod_owner: University of New Hampshire + contact: lincoln.lavoie@iol.unh.edu + lab: UNH lab + location: New Hampshire, USA + type: development + link: https://wiki.opnfv.org/pages/viewpage.action?pageId=12389095 +############################################# +jumphost: + name: jump-unh-pod1 + 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: + ## /dev/sda + - name: disk1 + disk_capacity: 447G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + os: ubuntu-16.04 + remote_params: &remote_params + type: ipmi + versions: + - 2.0 + user: admin + pass: password + remote_management: + <<: *remote_params + address: 10.10.52.12 + mac_address: "1c:1b:0d:e8:fb:8f" + interfaces: + ## enp2p1s0f1, not connected for now + - mac_address: "1c:1b:0d:e8:fb:87" + features: '' + name: 'nic1' + ## enp2p1s0f2, not connected for now + - mac_address: "1c:1b:0d:e8:fb:88" + speed: 10gb + features: '' + name: 'nic2' + ## enp2p1s0f3, not connected for now + - mac_address: "1c:1b:0d:e8:fb:89" + speed: 10gb + features: '' + name: 'nic3' + ## enp2p1s0f4, not connected for now + - mac_address: "1c:1b:0d:e8:fb:8a" + speed: 10gb + features: '' + name: 'nic4' + ## enp2p1s0f5, not connected for now + - mac_address: "1c:1b:0d:e8:fb:8b" + speed: 10gb + features: '' + name: 'nic5' +########################################## +nodes: + - name: small-cavium-2 + node: &nodeparams + 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: &disks + - name: 'disk1' + disk_capacity: 447G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + remote_management: + <<: *remote_params + address: 10.10.52.13 + mac_address: "1c:1b:0d:e7:49:f1" + interfaces: + ## enp2p1s0f1 + - mac_address: "1c:1b:0d:e7:49:e9" + speed: 10gb + features: '' + name: 'nic1' + ## enp2p1s0f2 + - mac_address: "1c:1b:0d:e7:49:ea" + speed: 10gb + features: '' + name: 'nic2' + ## enp2p1s0f3 + - mac_address: "1c:1b:0d:e7:49:eb" + features: '' + name: 'nic3' + ## enp2p1s0f4 + - mac_address: "1c:1b:0d:e7:49:ec" + features: '' + name: 'nic4' + ## enp2p1s0f5 + - mac_address: "1c:1b:0d:e7:49:ed" + features: '' + name: 'nic5' + ########################################## + - name: small-cavium-3 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 10.10.52.14 + mac_address: "1c:1b:0d:e8:fb:2b" + interfaces: + ## enp2p1s0f1 + - mac_address: "1c:1b:0d:e8:fb:23" + speed: 10gb + features: '' + name: 'nic1' + ## enp2p1s0f2 + - mac_address: "1c:1b:0d:e8:fb:24" + speed: 10gb + features: '' + name: 'nic2' + ## enp2p1s0f3 + - mac_address: "1c:1b:0d:e8:fb:25" + features: '' + name: 'nic3' + ## enp2p1s0f4 + - mac_address: "1c:1b:0d:e8:fb:26" + features: '' + name: 'nic4' + ## enp2p1s0f5 + - mac_address: "1c:1b:0d:e8:fb:27" + features: '' + name: 'nic5' + ########################################## + - name: small-cavium-4 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 10.10.52.15 + mac_address: "1c:1b:0d:e8:fb:99" + interfaces: + ## enp2p1s0f1 + - mac_address: "1c:1b:0d:e8:fb:91" + speed: 10gb + features: '' + name: 'nic1' + ## enp2p1s0f2 + - mac_address: "1c:1b:0d:e8:fb:92" + speed: 10gb + features: '' + name: 'nic2' + ## enp2p1s0f3 + - mac_address: "1c:1b:0d:e8:fb:93" + features: '' + name: 'nic3' + ## enp2p1s0f4 + - mac_address: "1c:1b:0d:e8:fb:94" + features: '' + name: 'nic4' + ## enp2p1s0f5 + - mac_address: "1c:1b:0d:e8:fb:95" + features: '' + name: 'nic5' + ################################################# + - name: big-cavium-1 + node: &bignodeparams + type: baremetal + vendor: cavium + model: thunderx + arch: aarch64 + cpus: 2 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 + cores: 96 + memory: 128G + disks: *disks + remote_management: + <<: *remote_params + address: 10.10.52.10 + mac_address: "40:8d:5c:e0:9f:cb" + interfaces: + ## enp2p1s0f1 + - mac_address: "40:8d:5c:e0:9f:c4" + speed: 10gb + features: '' + name: 'nic1' + ## enp6p1s0f1 + - mac_address: "40:8d:5c:e0:9f:c9" + speed: 40gb + features: '' + name: 'nic2' + ## enp2p1s0f2 + - mac_address: "40:8d:5c:e0:9f:c5" + features: '' + name: 'nic3' + ## enp2p1s0f3 + - mac_address: "40:8d:5c:e0:9f:c6" + features: '' + name: 'nic4' + ## enp2p1s0f4 + - mac_address: "40:8d:5c:e0:9f:c7" + features: '' + name: 'nic5' + ## enp2p1s0f5 + - mac_address: "40:8d:5c:e0:9f:c8" + speed: 40gb + features: '' + name: 'nic6' + ## enp6p1s0f2 + - mac_address: "40:8d:5c:e0:9f:ca" + features: '' + name: 'nic7' + ########################################## + - name: big-cavium-2 + node: *bignodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 10.10.52.11 + mac_address: "40:8d:5c:e0:9f:e6" + interfaces: + ## enp2p1s0f1 + - mac_address: "40:8d:5c:e0:9f:df" + speed: 10gb + features: '' + name: 'nic1' + ## enp6p1s0f1 + - mac_address: "40:8d:5c:e0:9f:e4" + speed: 40gb + features: '' + name: 'nic2' + ## enp2p1s0f2 + - mac_address: "40:8d:5c:e0:9f:e0" + features: '' + name: 'nic3' + ## enp2p1s0f3 + - mac_address: "40:8d:5c:e0:9f:e1" + features: '' + name: 'nic4' + ## enp2p1s0f4 + - mac_address: "40:8d:5c:e0:9f:e2" + features: '' + name: 'nic5' + ## enp2p1s0f5 + - mac_address: "40:8d:5c:e0:9f:e3" + speed: 40gb + features: '' + name: 'nic6' + ## enp6p1s0f2 + - mac_address: "40:8d:5c:e0:9f:e5" + features: '' + name: 'nic7' diff --git a/labs/unh/virtual1.yaml b/labs/unh/virtual1.yaml new file mode 100644 index 00000000..8dc2edda --- /dev/null +++ b/labs/unh/virtual1.yaml @@ -0,0 +1,164 @@ +############################################################################## +# Copyright (c) 2019 Ericsson AB, Mirantis Inc., 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 +############################################################################## +--- +### unh-virtual1 POD descriptor file ### + +version: 1.0 +details: + pod_owner: University of New Hampshire + contact: lincoln.lavoie@iol.unh.edu + lab: UNH lab + location: New Hampshire, USA + type: development + link: https://wiki.opnfv.org/display/INF/Lab+as+a+Service+2.0 +############################################################################## +jumphost: + name: unh-virtual1 + node: &jumpparams + type: baremetal + vendor: HP + model: ProLiant + arch: x86_64 + cpus: 2 + cpu_cflags: haswell + cores: 22 + memory: 512G + disks: + - name: 'disk1' + disk_capacity: 800G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + os: ubuntu-16.04 + remote_params: &remoteparas + type: ipmi + versions: + - 1.0 + - 2.0 + user: changeme + pass: changeme + remote_management: + <<: *remoteparas + address: 0.0.0.0/24 + mac_address: "00:00:00:00:00:00" + interfaces: + - name: 'nic1' + speed: 10gb + features: 'dpdk|sriov' + address: 100.64.202.5/24 + mac_address: "00:00:00:00:00:00" + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + - name: 'nic4' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" +############################################################################## +nodes: + - name: node-1 + node: &nodeparams + <<: *jumpparams + # Fuel overrides certain params (e.g. cpus, mem) based on node role later + type: virtual + vendor: libvirt + model: virt + cpus: 1 + cores: 4 + memory: 14G + disks: + - name: 'disk1' + disk_capacity: 400G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: &diskrotation 0 + remote_management: &remotemgmt + type: libvirt + user: changeme + pass: changeme + address: 'qemu:///system' + interfaces: &interfaces + - name: 'nic1' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt + vlan: native + - name: 'nic2' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic3' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic4' + speed: 1gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + ############################################################################ + - name: node-2 + node: + <<: *nodeparams + # Fuel overrides certain params (e.g. cpus, mem) based on node role later + cpus: 1 + cores: 4 + memory: 8G + disks: &disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-3 + node: + <<: *nodeparams + # Fuel overrides certain params (e.g. cpus, mem) based on node role later + cpus: 1 + cores: 4 + memory: 8G + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-4 + node: &compute_nodeparams + <<: *nodeparams + # Fuel overrides certain params (e.g. cpus, mem) based on node role later + cpus: 2 + cores: 18 + memory: 120G + disks: &compute_disks + - name: 'disk1' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + - name: 'disk2' + disk_capacity: 100G + disk_type: hdd + disk_interface: scsi # virtio-scsi + disk_rotation: *diskrotation + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-5 + node: *compute_nodeparams + disks: *compute_disks + remote_management: *remotemgmt + interfaces: *interfaces diff --git a/labs/zte/idf-pod1.yaml b/labs/zte/idf-pod1.yaml index a7428fd9..ff7ad820 100644 --- a/labs/zte/idf-pod1.yaml +++ b/labs/zte/idf-pod1.yaml @@ -10,11 +10,13 @@ idf: version: 0.1 + installer: ['apex', 'compass4nfv', 'daisy', 'fuel'] net_config: oob: interface: 0 ip-range: 192.168.1.101-192.168.1.105 vlan: null + mask: 29 admin: interface: 0 vlan: native @@ -32,7 +34,7 @@ idf: mask: 24 private: interface: 3 - vlan: 1120 + vlan: 1120-1150 network: 192.168.63.0 mask: 24 public: @@ -47,10 +49,12 @@ idf: jumphost: bridges: admin: 'br6' - mgmt: ~ + mgmt: 'br-mgmt' private: ~ public: 'br-external' network: + ntp_strata_host1: 1.pool.ntp.org + ntp_strata_host2: 0.pool.ntp.org node: # Ordered-list, index should be in sync with node index in PDF - interfaces: &interfaces diff --git a/labs/zte/idf-pod2.yaml b/labs/zte/idf-pod2.yaml index 960151d0..2bae8a12 100644 --- a/labs/zte/idf-pod2.yaml +++ b/labs/zte/idf-pod2.yaml @@ -11,12 +11,13 @@ idf: version: 0.1 # NOTE: Fuel checking is disabled until 'idf.fuel' is defined below - installer: ['apex', 'compass4nfv', 'daisy', 'joid'] + installer: ['apex', 'compass4nfv', 'daisy'] net_config: oob: interface: 0 ip-range: 192.168.1.106-192.168.1.110 vlan: null + mask: 29 admin: interface: 0 vlan: native diff --git a/labs/zte/idf-pod3.yaml b/labs/zte/idf-pod3.yaml index 702e2565..25b061a6 100644 --- a/labs/zte/idf-pod3.yaml +++ b/labs/zte/idf-pod3.yaml @@ -11,12 +11,13 @@ idf: version: 0.1 # NOTE: Fuel checking is disabled until 'idf.fuel' is defined below - installer: ['apex', 'compass4nfv', 'daisy', 'joid'] + installer: ['apex', 'compass4nfv', 'daisy'] net_config: oob: interface: 0 ip-range: 192.168.1.32-192.168.1.36 vlan: null + mask: 29 admin: interface: 0 vlan: native @@ -34,12 +35,12 @@ idf: mask: 24 private: interface: 3 - vlan: 1030 + vlan: native network: 192.168.13.0 mask: 24 public: interface: 3 - vlan: 103 + vlan: native network: 172.10.0.0 mask: 24 gateway: 172.10.0.1 diff --git a/labs/zte/idf-pod9.yaml b/labs/zte/idf-pod9.yaml index 1cdd5d88..a6c7dfa6 100644 --- a/labs/zte/idf-pod9.yaml +++ b/labs/zte/idf-pod9.yaml @@ -18,6 +18,7 @@ idf: interface: 0 ip-range: 192.168.176.166-192.168.176.168 vlan: null + mask: 29 admin: interface: 0 vlan: null |