diff options
Diffstat (limited to 'labs/arm')
-rw-r--r-- | labs/arm/idf-pod5.yaml | 75 | ||||
-rw-r--r-- | labs/arm/idf-pod6.yaml | 161 | ||||
-rw-r--r-- | labs/arm/idf-pod7.yaml | 136 | ||||
-rw-r--r-- | labs/arm/idf-pod8.yaml | 113 | ||||
-rw-r--r-- | labs/arm/idf-pod9.yaml | 117 | ||||
-rw-r--r-- | labs/arm/idf-virtual2.yaml | 83 | ||||
-rw-r--r-- | labs/arm/pod5.yaml | 90 | ||||
-rw-r--r-- | labs/arm/pod6.yaml | 111 | ||||
-rw-r--r-- | labs/arm/pod7.yaml | 241 | ||||
-rw-r--r-- | labs/arm/pod8.yaml | 263 | ||||
-rw-r--r-- | labs/arm/pod9.yaml | 311 | ||||
-rw-r--r-- | labs/arm/virtual2.yaml | 137 |
12 files changed, 1666 insertions, 172 deletions
diff --git a/labs/arm/idf-pod5.yaml b/labs/arm/idf-pod5.yaml index 52ea6eda..6aaefb70 100644 --- a/labs/arm/idf-pod5.yaml +++ b/labs/arm/idf-pod5.yaml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 Enea AB and others. +# 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 @@ -10,14 +10,59 @@ 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: ['apex', 'daisy', 'fuel'] + net_config: + oob: + ip-range: 10.0.8.3-10.0.8.10 + vlan: native + mask: 24 + admin: + interface: 0 + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 + vlan: 2183 + 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: 2184 + network: 10.2.0.0 + mask: 24 + private: + interface: 1 + vlan: 2185-2200 + network: 10.1.0.0 + mask: 24 + public: + interface: 1 + vlan: native + network: 10.0.8.0 + ip-range: 10.0.8.100-10.0.8.253 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.0.8.254 + dns: + - 8.8.8.8 + - 8.8.4.4 fuel: jumphost: bridges: admin: 'admin7_br0' mgmt: 'mgmt7_br0' - private: '' + private: ~ public: 'public7_br0' + maas: + # MaaS timeouts (in minutes) + timeout_comissioning: 10 + timeout_deploying: 15 network: + ntp_strata_host1: 1.se.pool.ntp.org + ntp_strata_host2: 0.se.pool.ntp.org node: # Ordered-list, index should be in sync with node index in PDF - interfaces: &interfaces @@ -36,3 +81,29 @@ idf: busaddr: *busaddr - interfaces: *interfaces busaddr: *busaddr + 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: vfio + 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: 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-pod6.yaml b/labs/arm/idf-pod6.yaml index db03686d..e07c2ea3 100644 --- a/labs/arm/idf-pod6.yaml +++ b/labs/arm/idf-pod6.yaml @@ -1,46 +1,115 @@ -##############################################################################
-# Copyright (c) 2017 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 6 installer descriptor file ###
-
-idf:
- version: 0.1
- fuel:
- jumphost:
- bridges:
- admin: 'admin14_br0'
- mgmt: 'mgmt14_br0'
- private: ''
- public: 'public14_br0'
- 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
+############################################################################## +# 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 6 installer descriptor file ### + +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 + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 + vlan: 2323 + 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: 2324 + network: 10.2.0.0 + mask: 24 + private: + interface: 2 + vlan: 2325-2340 + network: 10.1.0.0 + mask: 24 + public: + interface: 1 + vlan: native + network: 10.0.15.0 + ip-range: 10.0.15.100-10.0.15.253 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.0.15.254 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: 'admin14_br0' + mgmt: 'mgmt14_br0' + private: ~ + public: 'public14_br0' + maas: + # MaaS timeouts (in minutes) + timeout_comissioning: 10 + timeout_deploying: 15 + network: + ntp_strata_host1: 1.se.pool.ntp.org + ntp_strata_host2: 0.se.pool.ntp.org + node: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: &interfaces + # 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: 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/arm/idf-pod7.yaml b/labs/arm/idf-pod7.yaml new file mode 100644 index 00000000..d21fd875 --- /dev/null +++ b/labs/arm/idf-pod7.yaml @@ -0,0 +1,136 @@ +############################################################################## +# Copyright (c) 2017 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 7 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: ['apex', 'daisy', 'fuel'] + net_config: + oob: + ip-range: 10.0.16.2-10.0.16.6 + vlan: native + mask: 24 + admin: + interface: 0 + vlan: native + network: 192.168.11.0 + mask: 24 + mgmt: + interface: 1 + vlan: 2343 + 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: 2344 + network: 10.2.0.0 + mask: 24 + private: + interface: 1 + vlan: 2345-2360 + network: 10.1.0.0 + mask: 24 + public: + interface: 1 + vlan: native + network: 10.0.16.0 + ip-range: 10.0.16.100-10.0.16.253 # Some IPs are in use by lab infra + mask: 24 + gateway: 10.0.16.254 + dns: + - 8.8.8.8 + - 8.8.4.4 + fuel: + jumphost: + bridges: + admin: 'admin15_br0' + mgmt: 'mgmt15_br0' + private: ~ + public: 'public15_br0' + maas: + # MaaS timeouts (in minutes) + timeout_comissioning: 10 + timeout_deploying: 15 + network: + ntp_strata_host1: 1.se.pool.ntp.org + ntp_strata_host2: 0.se.pool.ntp.org + node: + # Ordered-list, index should be in sync with node index in PDF + - interfaces: &interfaces_a + # Ordered-list, index should be in sync with interface index in PDF + - 'enP5s3' + - 'enP2p1s0f2' + - 'enP2p1s0f1' + - 'enP2p1s0f3' + busaddr: &busaddr_a + # Bus-info reported by `ethtool -i ethX` + - '0005:90:00.0' + - '0002:01:00.2' + - '0002:01:00.1' + - '0002:01:00.3' + - interfaces: *interfaces_a + busaddr: *busaddr_a + - interfaces: *interfaces_a + busaddr: *busaddr_a + - interfaces: &interfaces_b + - 'eth0' + - 'eth1' + busaddr: &busaddr_b + - 'e0700000.xgmac' + - 'e0900000.xgmac' + - interfaces: *interfaces_b + busaddr: *busaddr_b + reclass: + node: + - compute_params: &compute_params_a + common: + nova_cpu_pinning: &nova_cpu_pinning_common_a "2-47" + compute_hugepages_size: 2M + compute_hugepages_count: 8192 + compute_hugepages_mount: /mnt/hugepages_2M + 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_kernel_isolcpu: *nova_cpu_pinning_common_a + compute_dpdk_driver: vfio + 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: vfio-pci + dpdk0_n_rxq: 2 + - compute_params: *compute_params_a + - compute_params: *compute_params_a + - compute_params: &compute_params_b + common: + nova_cpu_pinning: &nova_cpu_pinning_common_b "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_b + 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_b + compute_dpdk_driver: vfio + 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: vfio-pci + dpdk0_n_rxq: 2 + - compute_params: *compute_params_b diff --git a/labs/arm/idf-pod8.yaml b/labs/arm/idf-pod8.yaml new file mode 100644 index 00000000..2b0146ac --- /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: 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/arm/idf-pod9.yaml b/labs/arm/idf-pod9.yaml new file mode 100644 index 00000000..27ae3cdb --- /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: 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/arm/idf-virtual2.yaml b/labs/arm/idf-virtual2.yaml new file mode 100644 index 00000000..fa83e191 --- /dev/null +++ b/labs/arm/idf-virtual2.yaml @@ -0,0 +1,83 @@ +############################################################################## +# 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: native + 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: + 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/pod5.yaml b/labs/arm/pod5.yaml index 7ee358fc..3a55678e 100644 --- a/labs/arm/pod5.yaml +++ b/labs/arm/pod5.yaml @@ -1,6 +1,14 @@ +############################################################################## +# 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 5 descriptor file ### +version: 1.0 details: pod_owner: ENEA AB contact: dan.lilliehorn@enea.com @@ -9,40 +17,6 @@ details: type: production link: https://wiki.opnfv.org/display/pharos/Enea+Hosting ############################################################################## -net_config: - oob: - ip-range: 10.0.8.3-10.0.8.10 - vlan: native - admin: - interface: 0 - vlan: native - network: 192.168.11.0 - mask: 24 - mgmt: - interface: 1 - vlan: 2183 - network: 172.16.10.0 - mask: 24 - storage: - interface: 1 - vlan: 2184 - network: 10.2.0.0 - mask: 24 - private: - interface: 1 - vlan: 2185 - network: 10.1.0.0 - mask: 24 - public: - interface: 1 - vlan: native - network: 10.0.8.0 - mask: 24 - gateway: 10.0.8.254 - dns: - - 8.8.8.8 - - 8.8.4.4 -############################################################################## jumphost: name: jenkins-slave-arm-pod5 node: @@ -74,24 +48,25 @@ jumphost: interfaces: # Connected, used only for admin/PXE - mac_address: "68:05:ca:34:60:e3" + address: 192.168.11.1 speed: 1gb features: '' + name: 'nic1' # Not connected for now - mac_address: "00:0f:b7:04:00:c1" speed: 40gb features: 'dpdk|sriov' + name: 'nic2' # Not connected for now - mac_address: "00:0f:b7:04:00:c2" speed: 40gb features: 'dpdk|sriov' + name: 'nic3' # Connected, trunk for all other VLANs - mac_address: "00:0f:b7:04:00:c0" speed: 10gb features: '' - fixed_ips: - admin: 192.168.11.1 - mgmt: 172.16.10.1 - public: 10.0.8.9 + name: 'nic4' ############################################################################## nodes: - name: softiron-3 @@ -109,6 +84,7 @@ nodes: disk_capacity: 128G disk_type: ssd disk_interface: sata + disk_rotation: 0 - name: 'disk2' disk_capacity: 2048G disk_type: hdd @@ -123,18 +99,16 @@ nodes: - mac_address: "e0:ff:f7:00:08:ae" speed: 10gb features: '' + name: 'nic1' # Connected, trunk for all other VLANs - mac_address: "e0:ff:f7:00:08:af" speed: 10gb features: '' - fixed_ips: - admin: 192.168.11.2 - mgmt: 172.16.10.141 - public: 10.0.8.141 + name: 'nic2' ############################################################################ - name: softiron-4 node: *nodeparams - disk: *disks + disks: *disks remote_management: <<: *remote_params address: 10.0.8.4 @@ -143,17 +117,15 @@ nodes: - mac_address: "e0:ff:f7:00:08:b1" speed: 10gb features: '' + name: 'nic1' - mac_address: "e0:ff:f7:00:08:b2" speed: 10gb features: '' - fixed_ips: - admin: 192.168.11.3 - mgmt: 172.16.10.142 - public: 10.0.8.142 + name: 'nic2' ############################################################################ - name: softiron-5 node: *nodeparams - disk: *disks + disks: *disks remote_management: <<: *remote_params address: 10.0.8.5 @@ -162,17 +134,15 @@ nodes: - mac_address: "e0:ff:f7:00:08:bd" speed: 10gb features: '' + name: 'nic1' - mac_address: "e0:ff:f7:00:08:be" speed: 10gb features: '' - fixed_ips: - admin: 192.168.11.4 - mgmt: 172.16.10.143 - public: 10.0.8.143 + name: 'nic2' ############################################################################ - name: softiron-6 node: *nodeparams - disk: *disks + disks: *disks remote_management: <<: *remote_params address: 10.0.8.6 @@ -181,17 +151,15 @@ nodes: - mac_address: "e0:ff:f7:00:08:c6" speed: 10gb features: '' + name: 'nic1' - mac_address: "e0:ff:f7:00:08:c7" speed: 10gb features: '' - fixed_ips: - admin: 192.168.11.5 - mgmt: 172.16.10.101 - public: 10.0.8.101 + name: 'nic2' ############################################################################ - name: softiron-7 node: *nodeparams - disk: *disks + disks: *disks remote_management: <<: *remote_params address: 10.0.8.7 @@ -200,10 +168,8 @@ nodes: - mac_address: "e0:ff:f7:00:08:cf" speed: 10gb features: '' + name: 'nic1' - mac_address: "e0:ff:f7:00:08:d0" speed: 10gb features: '' - fixed_ips: - admin: 192.168.11.6 - mgmt: 172.16.10.102 - public: 10.0.8.102 + name: 'nic2' diff --git a/labs/arm/pod6.yaml b/labs/arm/pod6.yaml index f4f92ddd..3b558164 100644 --- a/labs/arm/pod6.yaml +++ b/labs/arm/pod6.yaml @@ -1,6 +1,14 @@ +############################################################################## +# 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 6 descriptor file ### +version: 1.0 details: pod_owner: ENEA AB contact: dan.lilliehorn@enea.com @@ -9,40 +17,6 @@ details: type: production link: https://wiki.opnfv.org/display/pharos/Enea+Hosting ############################################################################## -net_config: - oob: - ip-range: 10.0.1.54-10.0.1.58 - vlan: native - admin: - interface: 0 - vlan: native - network: 192.168.11.0 - mask: 24 - mgmt: - interface: 1 - vlan: 2323 - network: 172.16.10.0 - mask: 24 - storage: - interface: 1 - vlan: 2324 - network: 10.2.0.0 - mask: 24 - private: - interface: 1 - vlan: 2325 - network: 10.1.0.0 - mask: 24 - public: - interface: 1 - vlan: native - network: 10.0.15.0 - mask: 24 - gateway: 10.0.15.254 - dns: - - 8.8.8.8 - - 8.8.4.4 -############################################################################## jumphost: name: jenkins-slave-arm-pod6 node: @@ -60,6 +34,7 @@ jumphost: disk_capacity: 120G disk_type: ssd disk_interface: sata + disk_rotation: 0 ## /dev/sdb - name: disk2 disk_capacity: 1T @@ -86,24 +61,25 @@ jumphost: interfaces: ## eth0, Not connected for now - mac_address: "00:01:73:02:36:d4" + address: 192.168.11.1 speed: 1gb features: '' + name: 'nic1' ## eth1, Connected, used only for admin/PXE - mac_address: "00:01:73:02:36:d5" speed: 1gb features: '' + name: 'nic2' ## eth2, Not connected for now - mac_address: "00:01:73:02:36:d6" speed: 1gb features: '' + name: 'nic3' ## eth3, Connected, trunk for all other VLANs - mac_address: "00:01:73:02:36:d7" speed: 10gb features: '' - fixed_ips: - admin: 192.168.11.1 - mgmt: 172.16.10.1 - public: 10.0.15.9 + name: 'nic4' ############################################################################## nodes: - name: cn8890-24 @@ -121,6 +97,7 @@ nodes: disk_capacity: 480G disk_type: ssd disk_interface: sata + disk_rotation: 0 remote_management: <<: *remote_params address: 10.0.1.54 @@ -130,34 +107,36 @@ nodes: - mac_address: "68:05:ca:5a:c3:a7" speed: 1gb features: '' + name: 'nic1' ## enP2p1s0f1, Connected, trunk for all other VLANs - mac_address: "1c:1b:0d:e8:fa:83" speed: 10gb features: 'dpdk|sriov' + name: 'nic2' ## enP2p1s0f2, Not connected for now - mac_address: "1c:1b:0d:e8:fa:84" speed: 10gb features: 'dpdk|sriov' + name: 'nic3' ## enP2p1s0f3, Not connected for now - mac_address: "1c:1b:0d:e8:fa:85" speed: 10gb features: 'dpdk|sriov' + name: 'nic4' ## enP2p1s0f4, Not connected for now - mac_address: "1c:1b:0d:e8:fa:86" speed: 10gb features: 'dpdk|sriov' + name: 'nic5' ## enP2p1s0f5, Not connected for now - mac_address: "1c:1b:0d:e8:fa:87" speed: 10gb features: 'dpdk|sriov' - fixed_ips: - admin: 192.168.11.2 - mgmt: 172.16.10.142 - public: 10.0.15.142 + name: 'nic6' ############################################################################ - name: cn8890-25 node: *nodeparams - disk: *disks + disks: *disks remote_management: <<: *remote_params address: 10.0.1.55 @@ -166,29 +145,31 @@ nodes: - mac_address: "68:05:ca:5a:c3:bc" speed: 1gb features: '' + name: 'nic1' - mac_address: "1c:1b:0d:e8:fb:a5" speed: 10gb features: 'dpdk|sriov' + name: 'nic2' - mac_address: "1c:1b:0d:e8:fb:a6" speed: 10gb features: 'dpdk|sriov' + name: 'nic3' - mac_address: "1c:1b:0d:e8:fb:a7" speed: 10gb features: 'dpdk|sriov' + name: 'nic4' - mac_address: "1c:1b:0d:e8:fb:a8" speed: 10gb features: 'dpdk|sriov' + name: 'nic5' - mac_address: "1c:1b:0d:e8:fb:a9" speed: 10gb features: 'dpdk|sriov' - fixed_ips: - admin: 192.168.11.3 - mgmt: 172.16.10.143 - public: 10.0.15.143 + name: 'nic6' ############################################################################ - name: cn8890-26 node: *nodeparams - disk: *disks + disks: *disks remote_management: <<: *remote_params address: 10.0.1.56 @@ -197,29 +178,31 @@ nodes: - mac_address: "68:05:ca:61:b9:00" speed: 1gb features: '' + name: 'nic1' - mac_address: "1c:1b:0d:e8:fa:65" speed: 10gb features: 'dpdk|sriov' + name: 'nic2' - mac_address: "1c:1b:0d:e8:fa:66" speed: 10gb features: 'dpdk|sriov' + name: 'nic3' - mac_address: "1c:1b:0d:e8:fa:67" speed: 10gb features: 'dpdk|sriov' + name: 'nic4' - mac_address: "1c:1b:0d:e8:fa:68" speed: 10gb features: 'dpdk|sriov' + name: 'nic5' - mac_address: "1c:1b:0d:e8:fa:69" speed: 10gb features: 'dpdk|sriov' - fixed_ips: - admin: 192.168.11.4 - mgmt: 172.16.10.144 - public: 10.0.15.144 + name: 'nic6' ############################################################################ - name: cn8890-27 node: *nodeparams - disk: *disks + disks: *disks remote_management: <<: *remote_params address: 10.0.1.57 @@ -228,29 +211,31 @@ nodes: - mac_address: "68:05:ca:57:f7:16" speed: 1gb features: '' + name: 'nic1' - mac_address: "1c:1b:0d:e8:fb:19" speed: 10gb features: 'dpdk|sriov' + name: 'nic2' - mac_address: "1c:1b:0d:e8:fb:1a" speed: 10gb features: 'dpdk|sriov' + name: 'nic3' - mac_address: "1c:1b:0d:e8:fb:1b" speed: 10gb features: 'dpdk|sriov' + name: 'nic4' - mac_address: "1c:1b:0d:e8:fb:1c" speed: 10gb features: 'dpdk|sriov' + name: 'nic5' - mac_address: "1c:1b:0d:e8:fb:1d" speed: 10gb features: 'dpdk|sriov' - fixed_ips: - admin: 192.168.11.5 - mgmt: 172.16.10.145 - public: 10.0.15.145 + name: 'nic6' ############################################################################ - name: cn8890-28 node: *nodeparams - disk: *disks + disks: *disks remote_management: <<: *remote_params address: 10.0.1.58 @@ -259,22 +244,24 @@ nodes: - mac_address: "68:05:ca:61:97:5a" speed: 1gb features: '' + name: 'nic1' - mac_address: "1c:1b:0d:e8:fb:7d" speed: 10gb features: 'dpdk|sriov' + name: 'nic2' - mac_address: "1c:1b:0d:e8:fb:7e" speed: 10gb features: 'dpdk|sriov' + name: 'nic3' - mac_address: "1c:1b:0d:e8:fb:7f" speed: 10gb features: 'dpdk|sriov' + name: 'nic4' - mac_address: "1c:1b:0d:e8:fb:80" speed: 10gb features: 'dpdk|sriov' + name: 'nic5' - mac_address: "1c:1b:0d:e8:fb:81" speed: 10gb features: 'dpdk|sriov' - fixed_ips: - admin: 192.168.11.6 - mgmt: 172.16.10.146 - public: 10.0.15.146 + name: 'nic6' diff --git a/labs/arm/pod7.yaml b/labs/arm/pod7.yaml new file mode 100644 index 00000000..bb624799 --- /dev/null +++ b/labs/arm/pod7.yaml @@ -0,0 +1,241 @@ +############################################################################## +# 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 7 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-pod7 + node: + type: baremetal + vendor: AppliedMicro + model: XGene 1 + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm cpuid + cores: 8 + memory: 32G + disks: + # /dev/sda + - name: disk1 + disk_capacity: 120G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + # /dev/sdb + - name: disk2 + disk_capacity: 1T + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + # /dev/sdc + - name: disk3 + 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: 0.0.0.0 + mac_address: "00:00:00:00:00:00" + interfaces: + # eth0, Not connected + - mac_address: "00:01:73:02:3b:28" + address: 192.168.11.1 + speed: 1gb + features: '' + name: 'nic1' + # eth1, Connected for PXE + - mac_address: "00:01:73:02:3b:29" + speed: 1gb + features: '' + name: 'nic2' + # eth2, Not connected + - mac_address: "00:01:73:02:3b:2a" + speed: 1gb + features: '' + name: 'nic3' + # eth3, Connected for truck traffic + - mac_address: "00:01:73:02:3b:2b" + speed: 10gb + features: '' + name: 'nic4' +############################################################################## +nodes: + - name: cn8890-6 + node: &nodeparams_a + 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: &disks_a + - name: 'disk1' + disk_capacity: 500G + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + remote_management: + <<: *remote_params + address: 10.0.16.2 + mac_address: "40:8D:5C:BA:D2:32" + interfaces: + # enP5s3, Connected, used only for admin/PXE + - mac_address: "68:05:ca:3d:93:14" + speed: 1gb + features: '' + name: 'nic1' + # enP2p1s0f2, Connected, trunk for all other VLANs + - mac_address: "00:0f:b7:03:00:c1" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + # enP2p1s0f1, Not connected + - mac_address: "00:0f:b7:03:00:c0" + speed: 1gb + features: '' + name: 'nic3' + # enP2p1s0f3, Not connected + - mac_address: "00:0f:b7:03:00:c2" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + ############################################################################ + - name: cn8890-8 + node: *nodeparams_a + disks: *disks_a + remote_management: + <<: *remote_params + address: 10.0.16.3 + mac_address: "40:8D:5C:BA:B9:60" + interfaces: + # enP5s3, Connected, used only for admin/PXE + - mac_address: "68:05:ca:3f:7f:f3" + speed: 1gb + features: '' + name: 'nic1' + # enP2p1s0f2, Connected, trunk for all other VLANs + - mac_address: "00:0f:b7:05:00:c1" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + # enP2p1s0f1, Not connected + - mac_address: "00:0f:b7:05:00:c0" + speed: 1gb + features: '' + name: 'nic3' + # enP2p1s0f3, Not connected + - mac_address: "00:0f:b7:05:00:c2" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + ############################################################################ + - name: cn8890-10 + node: *nodeparams_a + disks: *disks_a + remote_management: + <<: *remote_params + address: 10.0.16.4 + mac_address: "40:8D:5C:BA:B9:65" + interfaces: + # enP5s3, Connected, used only for admin/PXE + - mac_address: "68:05:ca:3d:93:0f" + speed: 1gb + features: '' + name: 'nic1' + # enP2p1s0f2, Connected, trunk for all other VLANs + - mac_address: "00:0f:b7:07:00:c1" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + # enP2p1s0f1, Not connected + - mac_address: "00:0f:b7:07:00:c0" + speed: 1gb + features: '' + name: 'nic3' + # enP2p1s0f3, Not connected + - mac_address: "00:0f:b7:07:00:c2" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + ############################################################################ + - name: softiron-1 + node: &nodeparams_b + type: baremetal + vendor: American Megatrends Inc + model: Overdrive/Supercharger + arch: aarch64 + cpus: 1 + cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32 + cores: 8 + memory: 32G + disks: &disks_b + # dev/sda + - name: 'disk1' + disk_capacity: 128G + 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 + remote_management: + <<: *remote_params + address: 10.0.16.5 + mac_address: "E0:FF:F7:00:04:21" + interfaces: + # eth0, Connected, used only for admin/PXE + - mac_address: "e0:ff:f7:00:05:96" + speed: 1gb + features: '' + name: 'nic1' + # eth1, Connected, trunk for all other VLANs + - mac_address: "e0:ff:f7:00:05:97" + speed: 1gb + features: '' + name: 'nic2' + ############################################################################ + - name: softiron-2 + node: *nodeparams_b + disks: *disks_b + remote_management: + <<: *remote_params + address: 10.0.16.6 + mac_address: "E0:FF:F7:00:04:29" + interfaces: + # eth0, Connected, used only for admin/PXE + - mac_address: "e0:ff:f7:00:05:93" + speed: 1gb + features: '' + name: 'nic1' + # eth1, Connected, trunk for all other VLANs + - mac_address: "e0:ff:f7:00:05:94" + speed: 1gb + features: '' + name: 'nic2' 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..3c2b3b10 --- /dev/null +++ b/labs/arm/virtual2.yaml @@ -0,0 +1,137 @@ +############################################################################## +# 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: 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: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt + vlan: native + - name: 'nic2' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic3' + speed: 10gb + features: 'dpdk|sriov' + mac_address: "00:00:00:00:00:00" + vlan: native + - name: 'nic4' + speed: 10gb + 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: *disks + remote_management: *remotemgmt + interfaces: *interfaces + ############################################################################ + - name: node-5 + node: *nodeparams + disks: *disks + remote_management: *remotemgmt + interfaces: *interfaces |