diff options
Diffstat (limited to 'labs')
54 files changed, 6020 insertions, 771 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 diff --git a/labs/bii/idf-pod1.yaml b/labs/bii/idf-pod1.yaml new file mode 100644 index 00000000..00b6d126 --- /dev/null +++ b/labs/bii/idf-pod1.yaml @@ -0,0 +1,75 @@ +############################################################################## +# Copyright (c) 2018 BII-CFIEC 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 +############################################################################## +--- +### This is a BII POD1 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', '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 + network: 10.20.0.0 + mask: 24 + mgmt: + interface: 2 + vlan: 101 + network: 192.168.101.0 + mask: 24 + private: + interface: 3 + vlan: 102-132 + network: 192.168.102.0 + mask: 24 + public: + interface: 1 + vlan: native + network: 192.168.20.0 + mask: 24 + gateway: 192.168.20.1 + dns: + - 114.114.114.114 + - 8.8.8.8 + fuel: + jumphost: + bridges: + admin: 'br-pxe' + mgmt: 'br-ctl' + private: ~ + public: ~ + 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 + - 'eno1' + - 'eno2' + - 'eno3' + - 'eno4' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:01:00.0' + - '0000:01:00.1' + - '0000:02:00.0' + - '0000:02:00.1' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr diff --git a/labs/bii/pod1.yaml b/labs/bii/pod1.yaml index 29d9a4e2..40ac58d4 100644 --- a/labs/bii/pod1.yaml +++ b/labs/bii/pod1.yaml @@ -1,193 +1,251 @@ -### This is a BII POD1 descriptor file ### +############################################################################## +# Copyright (c) 2018 BII-CFIEC 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 +############################################################################## --- +### This is a BII POD1 descriptor file ### + +version: 1.0 details: - pod owner: ylong@BII + pod_owner: ylong contact: ylong@biigroup.cn, zjtang@biigroup.cn lab: BII Pharos LAB location: BDA, Beijing, China type: development link: https://wiki.opnfv.org/display/pharos/BII ################################################### -net_config: - admin: - interface: 0 - vlan: 0 - network: 10.20.0.0 - mask: 24 - gateway: 10.20.0.1 - dns: 10.20.0.1 - mgmt: - interface: 0 - vlan: 102 - network: 192.168.102.0 - mask: 24 - storage: - interface: 0 - vlan: 101 - network: 192.168.101.0 - mask: 24 - private: - interface: 0 - vlan: 103 - network: 192.168.103.0 - mask: 24 - public: - interface: 1 - vlan: 0 - network: 192.168.20.0 - mask: 24 -################################################### jumphost: name: fuel node: - type: baremetal # can be virtual or baremetal + type: baremetal vendor: Dell Inc. model: powerEdge 720 arch: x86_64 cpus: 2 - cpu_cflags: haswell # add values based on CFLAGS in GCC - cores: 8 # physical cores, not including hyper-threads + cpu_cflags: haswell + cores: 4 memory: 16G - disks: # disk list - - name: 'disk1' # first disk - disk_capacity: 300G # volume - disk_type: hdd # several disk types possible - disk_interface: sas # several interface types possible - disk_rotation: 15000 # define rotation speed of disk - - name: 'disk2' # second disk - disk_capacity: 300G - disk_type: hdd - disk_interface: sas - disk_rotation: 15000 - - name: 'disk3' # third disk - disk_capacity: 300G - disk_type: hdd - disk_interface: sas - disk_rotation: 15000 - - name: 'disk4' # fourth disk - disk_capacity: 300G - disk_type: hdd - disk_interface: sas - disk_rotation: 15000 - - name: 'disk5' # fifth disk - disk_capacity: 300G + disks: + - name: 'disk1' + disk_capacity: 1100G disk_type: hdd disk_interface: sas disk_rotation: 15000 - os: centos-7.3 # operation system installed + os: ubuntu-16.04 remote_params: &remote_params type: ipmi versions: - 2.0 - user: - pass: + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAUnK7YuVSij4ALxIM+562DzeMEk0TaCoAOAcq + vHfnXEGI6IVpLtA/5d8y+tcmy82azpcNAIRvIGT08iEPwxo/Sa8MIIB1QFd5 + mC2I+pMhbowXmCUlU3m7gxDvsOYVkUYfxswtQoKUFSnG2mAZQA8L2Vpfbc2V + fWOOQlsNuJ4g7eN22bpODUDi5XzdFuBNUhRYNGQwGre4OUM6Qb+5QyXN8hKA + rHo7bI+36WWQSTdZHKXr9sJviQsWqAYXDRNIthdUbb8FlkAUdtV65eUB36hB + 7KEjbjK8aMpsQIIOjCmc/LONIFzkrKC2nGWP83iG++aWnoXW+hHSO9bGhfrt + 41I3JjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBC+t7WDS6WRtLT3UTTx + wXGCgBBrhvF5qjnbDl55TN2fhb2k] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAtsyAgyyRp3U3uMkyG0tHSW0e1y7Qq3LCpIRs + E0K6745xTmVPMLzbL+8OpgBIieLFukZnWNoLtdoEfZlYbw4En5DSMpkkmWgi + 35329Bs2eIU4lNUtjFi6UvHMB+j+gvVpObRgn1EfC2ngbgognw94+aA2LBiZ + oWKIk7iRmtLTguZLd72mdV+a/Ukk7lMeYz4OF4c4myMZzk4c1F9L3VLYux0+ + xcbZw/WRZHgYg1YHONX2WNHTf91cyd282BG7rLNaY4mO7XWU9mpmqeWHjJ7N + fpwPEfwt8dJq2b+p0o1FDRyAEF375AmMfwqupDk33fecFj6elr4EMzeusrFh + RiV9wjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBABjHF90Ke9WX+NZGzZ + MUPLgBDJhm3lONPvX22d5DFMpoXy] remote_management: <<: *remote_params - address: 192.168.20.200 + address: 192.168.20.200/24 mac_address: "44:A8:42:1A:68:78" - interfaces: # physical interface list - - "44:a8:42:15:10:03" - - "44:a8:42:15:10:04" - fixed_ips: - admin: 10.20.0.2 - public: 192.168.20.5 -################################################### + interfaces: + - name: 'nic1' + address: 10.10.0.2/24 + mac_address: "44:a8:42:15:10:03" + vlan: native + - name: 'nic2' + address: 192.168.20.5/24 + mac_address: "44:a8:42:15:10:04" + vlan: native + - name: 'nic3' + address: 192.168.101.2/24 + mac_address: "44:a8:42:15:10:05" + vlan: 101 + - name: 'nic4' + mac_address: "44:a8:42:15:10:06" nodes: - - name: compute1 + - name: pod1-ctl01 node: &nodeparas type: baremetal vendor: Dell Inc. model: powerEdge 720 arch: x86_64 cpus: 2 - cpu_cflags: haswell # add values based on CFLAGS in GCC - cores: 8 # physical cores, not including hyper-threads + cpu_cflags: haswell + cores: 4 memory: 32G - disks: &disk_A # disk list - - name: 'disk1' # first disk - disk_capacity: 128G # volume - disk_type: ssd # several disk types possible - disk_interface: sas # several interface types possible - disk_rotation: 15000 # define rotation speed of disk - - name: 'disk2' # second disk - disk_capacity: 600G - disk_type: hdd + disks: &disks_A + - name: 'disk1' + disk_capacity: 128G + disk_type: ssd disk_interface: sas disk_rotation: 15000 - - name: 'disk3' # third disk - disk_capacity: 600G - disk_type: hdd - disk_interface: sas - disk_rotation: 15000 - - name: 'disk4' # fourth disk - disk_capacity: 600G - disk_type: hdd - disk_interface: sas - disk_rotation: 15000 - - name: 'disk5' # fifth disk - disk_capacity: 600G + - name: 'disk2' + disk_capacity: 2400G disk_type: hdd disk_interface: sas disk_rotation: 15000 remote_management: <<: *remote_params - address: 192.168.20.201 - mac_address: "44:A8:42:1A:70:BE" - interfaces: # physical interface list - - "44:a8:42:14:ee:64" - fixed_ips: - admin: 10.20.0.4 - ######################################## - - name: compute2 + address: 192.168.20.203/24 + mac_address: "44:A8:42:1A:49:A5" + interfaces: + - name: 'nic1' + speed: 1gb + features: '' + address: 10.20.0.16/24 + mac_address: "44:a8:42:14:cd:0d" + vlan: native + - name: 'nic2' + speed: 1gb + features: '' + address: 192.168.20.16/24 + mac_address: "44:a8:42:14:cd:0e" + vlan: native + - name: 'nic3' + speed: 1gb + features: '' + address: 192.168.101.16/24 + mac_address: "44:a8:42:14:cd:0f" + vlan: 101 + - name: 'nic4' + speed: 1gb + features: '' + mac_address: "44:a8:42:14:cd:10" + - name: pod1-ctl02 node: *nodeparas disks: *disks_A remote_management: <<: *remote_params - address: 192.168.20.202 - mac_address: "44:A8:42:1A:76:26" + address: 192.168.20.204/24 + mac_address: "44:A8:42:1A:76:2C" interfaces: - - "44:a8:42:14:cb:31" - fixed_ips: - admin: 10.20.0.5 - ######################################## - - name: controller1 + - name: 'nic1' + speed: 1gb + features: '' + address: 10.20.0.17/24 + mac_address: "44:a8:42:15:1b:e6" + vlan: native + - name: 'nic2' + speed: 1gb + features: '' + address: 192.168.20.17/24 + mac_address: "44:a8:42:15:1b:e7" + vlan: native + - name: 'nic3' + speed: 1gb + features: '' + address: 192.168.101.16/24 + mac_address: "44:a8:42:15:1b:e8" + vlan: 101 + - name: 'nic4' + speed: 1gb + features: '' + mac_address: "44:a8:42:15:1b:e9" + - name: pod1-ctl03 node: *nodeparas disks: *disks_A remote_management: <<: *remote_params - address: 192.168.20.203 - mac_address: "44:A8:42:1A:49:A5" + address: 192.168.20.205/24 + mac_address: "44:A8:42:13:D5:1B" interfaces: - - "44:a8:42:14:cd:0d" - - "44:a8:42:14:cd:0e" - fixed_ips: - admin: 10.20.0.6 - public: 192.168.20.12 - ######################################## - - name: controller2 + - name: 'nic1' + speed: 1gb + features: '' + address: 10.20.0.18/24 + mac_address: "44:a8:42:14:fc:1a" + vlan: native + - name: 'nic2' + speed: 1gb + features: '' + address: 192.168.20.18/24 + mac_address: "44:a8:42:14:fc:1b" + vlan: native + - name: 'nic3' + speed: 1gb + features: '' + address: 192.168.101.18/24 + mac_address: "44:a8:42:14:fc:1c" + vlan: 101 + - name: 'nic4' + speed: 1gb + features: '' + mac_address: "44:a8:42:14:fc:1d" + - name: pod1-cmp01 node: *nodeparas disks: *disks_A remote_management: <<: *remote_params - address: 192.168.20.204 - mac_address: "44:A8:42:1A:76:2C" + address: 192.168.20.201/24 + mac_address: "44:A8:42:1A:70:BE" interfaces: - - "44:a8:42:15:1b:e6" - - "44:a8:42:15:1b:e7" - fixed_ips: - admin: 10.20.0.7 - public: 192.168.20.13 - ######################################## - - name: controller3 + - name: 'nic1' + speed: 1gb + features: '' + address: 10.20.0.14/24 + mac_address: "44:a8:42:14:ee:64" + vlan: native + - name: 'nic2' + speed: 1gb + features: '' + address: 192.168.20.14/24 + mac_address: "44:a8:42:14:ee:65" + vlan: native + - name: 'nic3' + speed: 1gb + features: '' + address: 192.168.101.14/24 + mac_address: "44:a8:42:14:ee:66" + vlan: 101 + - name: 'nic4' + speed: 1gb + features: '' + mac_address: "44:a8:42:14:ee:67" + vlan: 102 + - name: pod1-cmp02 node: *nodeparas disks: *disks_A remote_management: <<: *remote_params - address: 192.168.20.205 - mac_address: "44:A8:42:13:D5:1B" + address: 192.168.20.202/24 + mac_address: "44:A8:42:1A:76:26" interfaces: - - "44:a8:42:14:fc:1a" - - "44:a8:42:14:fc:1b" - fixed_ips: - admin: 10.20.0.8 - public: 192.168.20.14 + - name: 'nic1' + speed: 1gb + features: '' + address: 10.20.0.13/24 + mac_address: "44:a8:42:14:cb:31" + vlan: native + - name: 'nic2' + speed: 1gb + features: '' + address: 192.168.20.13/24 + mac_address: "44:a8:42:14:cb:32" + vlan: native + - name: 'nic3' + speed: 1gb + features: '' + address: 192.168.101.13/24 + mac_address: "44:a8:42:14:cb:33" + vlan: 101 + - name: 'nic4' + speed: 1gb + features: '' + mac_address: "44:a8:42:14:cb:34" + vlan: 102 diff --git a/labs/ericsson/idf-pod1.yaml b/labs/ericsson/idf-pod1.yaml index 14f74d41..c08016b2 100644 --- a/labs/ericsson/idf-pod1.yaml +++ b/labs/ericsson/idf-pod1.yaml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 Ericsson AB, Mirantis Inc., Enea AB and others. +# 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 @@ -10,14 +10,54 @@ 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 + network: 192.168.11.0 # Untagged, 'PXE/Admin' for MaaS (no IP on JP) + mask: 24 + mgmt: + interface: 2 + vlan: 81 + network: 192.168.10.0 + ip-range: 192.168.10.10-192.168.10.254 # Some IPs are in use by lab infra + mask: 24 + storage: + interface: 2 + vlan: 82 + network: 192.168.20.0 + mask: 24 + private: + interface: 3 + vlan: 1000-1030 + network: 192.168.2.0 + mask: 24 + public: + interface: 2 + vlan: 80 + network: 100.64.200.0 + ip-range: 100.64.200.100-100.64.200.254 # Some IPs are in use by lab infra + mask: 24 + gateway: 100.64.200.1 + dns: + - 8.8.8.8 + - 8.8.4.4 fuel: jumphost: bridges: admin: 'pxebr' mgmt: 'br-mgmt' - private: '' + 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 new file mode 100644 index 00000000..301241b6 --- /dev/null +++ b/labs/ericsson/idf-pod2.yaml @@ -0,0 +1,132 @@ +############################################################################## +# 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 POD 2 installer descriptor file ### +idf: + version: 0.1 + 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..528152cb --- /dev/null +++ b/labs/ericsson/idf-virtual-pod1bl01.yaml @@ -0,0 +1,104 @@ +############################################################################## +# 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: + 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: 2048 + 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: "1024" + 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..e7ba00fb --- /dev/null +++ b/labs/ericsson/idf-virtual1.yaml @@ -0,0 +1,104 @@ +############################################################################## +# 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: + 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: 2048 + 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: "1024" + 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..586661a4 --- /dev/null +++ b/labs/ericsson/idf-virtual2.yaml @@ -0,0 +1,104 @@ +############################################################################## +# 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: + 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: 2048 + 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: "1024" + 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..4a7aa82d --- /dev/null +++ b/labs/ericsson/idf-virtual3.yaml @@ -0,0 +1,104 @@ +############################################################################## +# 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: + 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: 2048 + 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: "1024" + 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..ddcd621c --- /dev/null +++ b/labs/ericsson/idf-virtual4.yaml @@ -0,0 +1,104 @@ +############################################################################## +# 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: + 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: 2048 + 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: "1024" + 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..067ec0c0 --- /dev/null +++ b/labs/ericsson/idf-virtual5.yaml @@ -0,0 +1,104 @@ +############################################################################## +# 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: + 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: 2048 + 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: "1024" + 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 76ca002f..5059eabf 100644 --- a/labs/ericsson/pod1.yaml +++ b/labs/ericsson/pod1.yaml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 Ericsson AB, Mirantis Inc., Enea AB and others. +# 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 @@ -8,6 +8,7 @@ --- ### POD descriptor file ### +version: 1.0 details: pod_owner: Jose Lausuch contact: jose.lausuch@ericsson.com @@ -16,44 +17,6 @@ details: type: production link: https://wiki.opnfv.org/display/pharos/CI-ERICSSON-POD1 ############################################################################## -net_config: - # NOTE: Network names are likely to change after the PDF spec is updated - # NOTE: Some networks (e.g. admin) are created by the installer - # NOTE: Network-to-interface mapping will be reworked after PDF update - oob: - interface: 0 - ip-range: 172.16.1.16-172.16.1.21 - vlan: native - admin: - interface: 4 - vlan: native - network: 192.168.11.0 # Untagged, 'PXE/Admin' for MaaS (no IP on JP) - mask: 24 - mgmt: - interface: 2 - vlan: 81 - network: 192.168.10.0 - mask: 24 - storage: - interface: 2 - vlan: 82 - network: 192.168.20.0 - mask: 24 - private: - interface: 3 - vlan: 1000 - network: 192.168.2.0 - mask: 24 - public: - interface: 2 - vlan: 80 - network: 100.64.200.0 - mask: 24 - gateway: 100.64.200.1 - dns: - - 8.8.8.8 - - 8.8.4.4 -############################################################################## jumphost: name: CI-POD1-HOST node: &nodeparams @@ -77,47 +40,61 @@ jumphost: versions: - 1.0 - 2.0 - user: - pass: + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAuQkYMXyWaXfQQUhqa1uKr3idY/TDnYF+fMyb + uuI1EFGnqXyJyY5C6CxyR61sTBrni49LPh/EmuLWzv0SLclJYnIfSOQrCbO5 + Sy4IFen6eMGd4x8OLLN0cQBSRnpxFRnmGnnqdLjcZYDYSfvP8U0vE46cRFM+ + PWRBMJm9+2iz/+wPY8z1aqQ03YycSgKo7R7hEXlarqjJexr/mnP+WLXnz/yN + qi0/E9q93X8e0JnQnxRG69K/AOih4pjW4kW8T53JbFmSq5whTdF7SpGAsUqt + +5pr5Bs/9yMk9g00XqDmhiCNlNO8ADSDKW1YWQXWHQFMazwZI4GipQA9P/I6 + CXRrKTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCtE4yYqripA3lKyuS4 + O7T2gBBL83JWGyHgxbluxLakRfZx] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAcNPG79QTsU1TDQZBWMENe+jI9rOfqabAiXJb + K+fbSVRY9gUTis2Bxaq/fWq4VGycPDfeZIKfGK5lgwaxd+yWbfHpHU2Itfav + L5s7zoH8yCk6vvfdTGEa+rM/CupqMRF0l/N/bFHMjf1TpUycw37KfaEcpV8T + /+ZJdpNCt+C5n67liLWr/fIGtcZB7HVFlIJOfniVoF9EfSwrNkKAJ5vYSAGe + KYhqgbQ1EFWf9/dJdAq0A4HuKixiMpc6qOX/moNTLTRPd6jN2veT7t4blqZM + cQU8Y3avbnAurd6Bu5i52d9kGebkUfYqUnkNCzyObi6WU5ZuJ8oxdzcQghb3 + sIRM3jA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDA0e139hbToTK8gZ1/ + UoEfgBDHho1xQ2fi5kh1g0FyFTpw] remote_management: <<: *remoteparas address: 172.16.1.21/24 mac_address: "9C:B6:54:8E:C5:76" interfaces: - - nic: 'nic1' + - name: 'nic1' speed: 10gb features: 'dpdk|sriov' address: 100.64.200.5/24 mac_address: "38:ea:a7:8f:53:00" vlan: 80 - - nic: 'nic2' + - name: 'nic2' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:8f:53:01" vlan: native - - nic: 'nic3' + - name: 'nic3' speed: 10gb features: 'dpdk|sriov' address: 172.16.0.250/16 mac_address: "38:ea:a7:8f:06:00" vlan: native - - nic: 'nic4' + - name: 'nic4' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:8f:06:01" vlan: native - - nic: 'nic5' + - name: 'nic5' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "9c:b6:54:8a:05:70" vlan: native - - nic: 'nic6' + - name: 'nic6' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "9c:b6:54:8a:05:74" vlan: native ############################################################################## @@ -133,33 +110,27 @@ nodes: - name: 'nic1' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:17:6b:98" - name: 'nic2' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:17:6b:99" - name: 'nic3' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:17:6b:84" - name: 'nic4' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:17:6b:85" - - nic: 'nic5' + - name: 'nic5' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "14:58:d0:54:e7:88" vlan: native - - nic: 'nic6' + - name: 'nic6' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "00:00:00:00:00:00" vlan: native ############################################################################ @@ -174,33 +145,27 @@ nodes: - name: 'nic1' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:17:6b:7c" - name: 'nic2' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:17:6b:7d" - name: 'nic3' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:17:6b:6c" - name: 'nic4' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:17:6b:6d" - - nic: 'nic5' + - name: 'nic5' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "14:58:d0:54:6a:60" vlan: native - - nic: 'nic6' + - name: 'nic6' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "00:00:00:00:00:00" vlan: native ############################################################################ @@ -215,33 +180,27 @@ nodes: - name: 'nic1' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:17:6a:38" - name: 'nic2' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:17:6a:39" - name: 'nic3' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:17:6a:3c" - name: 'nic4' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:17:6a:3d" - - nic: 'nic5' + - name: 'nic5' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "14:58:d0:54:7a:28" vlan: native - - nic: 'nic6' + - name: 'nic6' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "00:00:00:00:00:00" vlan: native ############################################################################ @@ -251,38 +210,32 @@ 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 features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:8f:1f:d4" - name: 'nic2' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:8f:1f:d5" - name: 'nic3' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:8f:52:cc" - name: 'nic4' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:8f:52:cd" - - nic: 'nic5' + - name: 'nic5' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "9c:b6:54:8a:95:a0" vlan: native - - nic: 'nic6' + - name: 'nic6' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "00:00:00:00:00:00" vlan: native ############################################################################ @@ -297,32 +250,26 @@ nodes: - name: 'nic1' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:8f:07:50" - name: 'nic2' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:8f:07:51" - name: 'nic3' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:8f:12:48" - name: 'nic4' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "38:ea:a7:8f:12:49" - - nic: 'nic5' + - name: 'nic5' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "9c:b6:54:8a:10:18" vlan: native - - nic: 'nic6' + - name: 'nic6' speed: 10gb features: 'dpdk|sriov' - address: mac_address: "00:00:00:00:00:00" vlan: native diff --git a/labs/ericsson/pod2.yaml b/labs/ericsson/pod2.yaml index c6477faf..5131ff95 100644 --- a/labs/ericsson/pod2.yaml +++ b/labs/ericsson/pod2.yaml @@ -1,6 +1,7 @@ --- ### POD descriptor file ### +version: 1.0 details: pod_owner: Jose Lausuch contact: jose.lausuch@ericsson.com @@ -32,180 +33,254 @@ jumphost: versions: - 1.0 - 2.0 - user: - pass: + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAZ+KIpufJFbXv6vcsevPYdhO2lBkYCnmoMKNa + lwDsynavzbIDeZmUlpf8xCOu/f7/VQfQdJCd6aZSScALlPSYgr39b0SPPfnr + Kx3jfOZnu8SEK+UJIalvebApmMdKM/vaKTWENV5PXyGcYwf8Q2lVxyXpxLVs + /FkDg1kB2VpdYaVfseY98LgLkP06uyfBPXH189BlQrxZcw3Af64BYgWfpDDt + w3RzIGCxAOMMZ8lEOnY4ofrsWaQA5YH12ezOT3Mwd/wkOuqcU19fOYaeS9Ou + 050m6H9DJDnR5btjLIrjjKINp5Nf6hHG5mngUc5JVdRKNvD0ONBi6Bj0cvGF + STfaXTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDSD+x9ybRnBdCQaY7n + aDlygBA4t2kc8UOwZYE6ZZaFUgl1] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAkHaGqpTmg+YSLPS5AwhB1N6MBA9cXTA1oacT + 8bY1aLBi7HKbacJQjHOfr2FoIAABkgV7N+BXKfebMighfcDC9XtKGYnV3tCD + XpreNZgX8NmVaYOLP6sFkAk53oYljswKOVVUrAqXplZx4kBXYm0Az2beGg5J + 5LRNwu9Eh4SRYN4dFN/XKQMtsQzKjMWTBLde9snrbhYfOxSsAR0B4FD7WWik + viKQY82C6C3KbcBeESMPE/lgBj7KIPbYkpzk9N5GafK+XkUS2aopAAkQFGll + 60Y0/9LOwPzItCB1q/kEENgz1aw/nHeH3xQsErwepuZiW3SkMncPQ9L5Q5PR + hlricTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBB8T/wzhjtvtwZ+Iz2Y + SKM7gBBWbUmwjBdGX6aurCiyVGv2] remote_management: <<: *remoteparas - address: 172.16.2.11/24 + address: 172.16.2.11 mac_address: "58:20:B1:01:8A:F2" interfaces: - - nic: 'nic1' + - 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 + features: 'dpdk|sriov' + address: "172.29.236.10" mac_address: "5c:b9:01:8b:9f:e8" - vlan: 84 - - nic: 'nic2' + vlan: native + - name: 'nic2' speed: 10gb - features: 'dpdk,sriov' - address: 100.64.201.5/24 + features: 'dpdk|sriov' + address: "192.168.122.2" mac_address: "5c:b9:01:8b:9f:e9" vlan: native - - nic: 'nic3' + - name: 'nic3' speed: 10gb - features: 'dpdk,sriov' - address: 172.16.0.248/16 + features: 'dpdk|sriov' + address: "172.29.240.10" mac_address: "5c:b9:01:8b:9f:ec" - vlan: native - - nic: 'nic4' + vlan: 3010 + - name: 'nic4' speed: 10gb - features: 'dpdk,sriov' - address: 172.16.0.248/16 + features: 'dpdk|sriov' + 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' - address: + 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' - address: + 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' - address: + 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' - address: + 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' - address: + 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' - address: + 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' - address: + 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' - address: - mac_address: "5c:b9:01:8b:99:65" # second port, no connection + features: 'dpdk|sriov' + 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' - address: + 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' - address: + 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' - address: + 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' - address: + 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' - address: + 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' - address: + 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' - address: + 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' - address: + 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' - address: + 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' - address: + 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' - address: + 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' - address: + 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..9edebee4 --- /dev/null +++ b/labs/ericsson/virtual-pod1bl01.yaml @@ -0,0 +1,160 @@ +############################################################################## +# 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: 8 + 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: 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 diff --git a/labs/ericsson/virtual1.yaml b/labs/ericsson/virtual1.yaml new file mode 100644 index 00000000..c19d9c79 --- /dev/null +++ b/labs/ericsson/virtual1.yaml @@ -0,0 +1,160 @@ +############################################################################## +# 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: 8 + 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: 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 diff --git a/labs/ericsson/virtual2.yaml b/labs/ericsson/virtual2.yaml new file mode 100644 index 00000000..7298b78c --- /dev/null +++ b/labs/ericsson/virtual2.yaml @@ -0,0 +1,160 @@ +############################################################################## +# 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: 8 + 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: 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 diff --git a/labs/ericsson/virtual3.yaml b/labs/ericsson/virtual3.yaml new file mode 100644 index 00000000..33f2e09f --- /dev/null +++ b/labs/ericsson/virtual3.yaml @@ -0,0 +1,160 @@ +############################################################################## +# 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: 8 + 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: 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 diff --git a/labs/ericsson/virtual4.yaml b/labs/ericsson/virtual4.yaml new file mode 100644 index 00000000..cbf50f08 --- /dev/null +++ b/labs/ericsson/virtual4.yaml @@ -0,0 +1,160 @@ +############################################################################## +# 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: 8 + 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: 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 diff --git a/labs/ericsson/virtual5.yaml b/labs/ericsson/virtual5.yaml new file mode 100644 index 00000000..48260449 --- /dev/null +++ b/labs/ericsson/virtual5.yaml @@ -0,0 +1,153 @@ +############################################################################## +# 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: 8 + 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: 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 +############################################################################## diff --git a/labs/huawei/idf-pod1.yaml b/labs/huawei/idf-pod1.yaml new file mode 100644 index 00000000..00933bc4 --- /dev/null +++ b/labs/huawei/idf-pod1.yaml @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD 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 +############################################################################## +--- +### huawei-pod1 installer descriptor file ### + +idf: + version: 0.1 + # NOTE: Fuel checking is disabled until 'idf.fuel' is defined below + installer: ['apex', 'compass4nfv', 'daisy'] + net_config: + mgmt: + interface: 1 + vlan: native + network: 10.1.0.0 + mask: 24 + storage: + interface: 2 + vlan: 102 + network: 172.16.2.0 + mask: 24 + tenant: + interface: 2 + vlan: 101 + network: 172.16.1.0 + mask: 24 + external: + interface: 2 + vlan: native + network: 192.168.10.0 + mask: 24 + gateway: 192.168.10.1 + dns: + - 8.8.8.8 + - 8.8.4.4 + + compass: + jumphost: + network: + node: diff --git a/labs/huawei/pod1.yaml b/labs/huawei/pod1.yaml new file mode 100644 index 00000000..807c6f3e --- /dev/null +++ b/labs/huawei/pod1.yaml @@ -0,0 +1,193 @@ +############################################################################## +# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD 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 +############################################################################## +--- +### POD descriptor file ### + +version: 1.0 +details: + pod_owner: Tianwei Wu + contact: wutianwei1@hauwei.com + lab: Huawei Lab + location: Shanghai, China + type: production + link: https://wiki.opnfv.org/display/pharos/Huawei+Hosting + +# jumphost +jumphost: + name: huawei-pod1-jump + node: &nodeparams + type: baremetal + vendor: huawei + model: Intel(R) Xeon(R) + arch: x86_64 + cpus: 2 + cpu_cflags: haswell + cores: 16 + memory: 188G + disks: &disks + - name: 'disk1' + disk_capacity: 1.8T + disk_type: hdd + disk_interface: scsi + disk_rotation: 7200 + os: ubuntu-14.04 + remote_params: &remoteparas + type: ipmi + versions: + - 2.0 + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAOv/AsqePJWJjzf30Lwzo2FezlXwM43uvGqSV + yt79ut92tDsPsfb3SkV9biTT1/VELCB/1AqZnxpwNwERv0D7YLy5fmkYLsWo + SgOYlgQ5CmTPIBw7A67Vz6bCXjlplnHbhqR+3dYreH4ijHQgBWTvhTi8w584 + 9Z8e0+fSJfruV+UBTF9n0dEWK9nqRQqWlDWasztxwyNpTPp4gVQs0gs2SkeP + XtHFfwIBJtopNuWsIhLtu/Hs5ljttL354RYF1PIVrsi1Xobl7O/I/ykq8PGg + qkFveh4c9nRe/LQ+u8ggWKDSHJodvAcJm+YQTW1CcATA04cuc6bKq6Xaf1Fn + kHKB5zA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCKEo4HTTLDwyIixgCk + cHijgBA5aj2kBfsBvi99bXiDmet8] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAhb8LIGPlO3PUXwUS4zpOOmg3Wu35ZcdKUaMh + dFaW30bPBsle6V7N+2p8kLtpkvTQHyo3X1vOwhrEKwBvRHJ+XmgQCvYLqLXN + qZgNXWwAa2iJz6PjNs/rmvmoLx1pC3smRJeLGCpVSG6cLKXI02clDmnWxjKB + 3Sdhf/JKTLQgbsoTZYRSBGLM9/UC/Ox/n0kl8afuRfC88CytttnpyNWRBWZ6 + VV41hxCqshHhBvXnskMS/NEWfYWS972FOZ7FFYid7ZV3h6SbO4JOR7+haMbM + ublE8m1abmm1T5SYE245avYj94miYTaPIjq0mkI66xo+6haAlTPqq3/QeUGf + e0X2YjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCpodDnNWoVIL6jIRiP + 6O85gBByiatZ0M0qtpNScQXGCRC5] + remote_management: + <<: *remoteparas + address: 172.16.130.28/24 + mac_address: "E0:24:7F:02:15:A5" + interfaces: + - name: 'nic1' + speed: 1gb + address: 192.168.10.6/24 + mac_address: "e0:24:7f:02:15:a3" + vlan: native + - name: 'nic2' + speed: 1gb + address: 10.1.0.1/24 + mac_address: "e0:24:7f:02:15:a4" + vlan: native + - name: 'nic3' + speed: 1gb + mac_address: "90:e2:ba:06:47:04" + vlan: native + - name: 'nic4' + speed: 1gb + address: 172.16.130.50/24 + mac_address: "90:e2:ba:06:47:05" + vlan: native +# host1 +nodes: + - name: host1 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.130.26/24 + mac_address: "F8:4A:BF:55:A2:91" + interfaces: + - name: 'nic1' + speed: 1gb + mac_address: "f8:4a:bf:55:a2:8d" + - name: 'nic2' + speed: 1gb + mac_address: "f8:4a:bf:55:a2:8e" + - name: 'nic3' + speed: 1gb + mac_address: "f8:4a:bf:55:a2:8f" + - name: 'nic4' + speed: 1gb + mac_address: "f8:4a:bf:55:a2:90" + # host2 + - name: host2 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.130.27/24 + mac_address: "D8:49:0B:DA:5A:BB" + interfaces: + - name: 'nic1' + speed: 1gb + mac_address: "d8:49:0b:da:5a:b7" + - name: 'nic2' + speed: 1gb + mac_address: "d8:49:0b:da:5a:b8" + - name: 'nic3' + speed: 1gb + mac_address: "d8:49:0b:da:5a:b9" + - name: 'nic4' + speed: 1gb + mac_address: "d8:49:0b:da:5a:ba" + # host3 + - name: host3 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.130.29/24 + mac_address: "78:D7:52:A0:B1:9D" + interfaces: + - name: 'nic1' + speed: 1gb + mac_address: "78:d7:52:a0:b1:99" + - name: 'nic2' + speed: 1gb + mac_address: "78:d7:52:a0:b1:9a" + - name: 'nic3' + speed: 1gb + mac_address: "78:d7:52:a0:b1:9b" + - name: 'nic4' + speed: 1gb + mac_address: "78:d7:52:a0:b1:9c" + # host4 + - name: host4 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.130.30/24 + mac_address: "D8:49:0B:DA:5B:61" + interfaces: + - name: 'nic1' + speed: 1gb + mac_address: "d8:49:0b:da:5b:5d" + - name: 'nic2' + speed: 1gb + mac_address: "d8:49:0b:da:5b:5e" + - name: 'nic3' + speed: 1gb + mac_address: "d8:49:0b:da:5b:5f" + - name: 'nic4' + speed: 1gb + mac_address: "d8:49:0b:da:5b:60" + # host5 + - name: host5 + node: *nodeparams + disks: *disks + remote_management: + <<: *remoteparas + address: 172.16.130.31/24 + mac_address: "D8:49:0B:DA:56:89" + interfaces: + - name: 'nic1' + speed: 1gb + mac_address: "d8:49:0b:da:56:85" + - name: 'nic2' + speed: 1gb + mac_address: "d8:49:0b:da:56:86" + - name: 'nic3' + speed: 1gb + mac_address: "d8:49:0b:da:56:87" + - name: 'nic4' + speed: 1gb + mac_address: "d8:49:0b:da:56:88" diff --git a/labs/intel/idf-pod18.yaml b/labs/intel/idf-pod18.yaml new file mode 100644 index 00000000..0e23c862 --- /dev/null +++ b/labs/intel/idf-pod18.yaml @@ -0,0 +1,50 @@ +############################################################################## +# Copyright (c) 2018 Intel Corporation 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 +############################################################################## +--- +idf: + version: 0.1 + installer: ['joid'] + net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + oob: + interface: 0 + ip-range: + vlan: + mask: 24 + admin: # admin + interface: 1 + vlan: native + network: 10.10.181.0 + mask: 24 + gateway: 10.10.181.2 + bridge: brAdm + mgmt: # data + interface: 2 + vlan: + network: 10.10.182.0 + mask: 24 + storage: # storage + interface: 3 + vlan: + network: 10.10.182.0 + mask: 24 + private: # floating + interface: + vlan: + network: 10.10.180.0 + mask: 24 + bridge: brExt + public: # public + interface: + vlan: 1183 + network: 10.10.185.0 + mask: 24 + gateway: 10.10.185.1 + dns: + - 8.8.8.8 + - 8.8.4.4 diff --git a/labs/intel/pod18.yaml b/labs/intel/pod18.yaml index cc956976..088ef358 100644 --- a/labs/intel/pod18.yaml +++ b/labs/intel/pod18.yaml @@ -2,12 +2,13 @@ ### POD descriptor file ### +version: 1.0 details: pod_owner: Jack Morgan contact: jack.morgan@intel.com lab: Intel Pharos Lab location: Portland, Oregon, USA - type: {production|development} + type: production link: http://wiki.opnfv.org/display/pharos/Intel+Hosting jumphost: @@ -26,31 +27,31 @@ jumphost: disk_capacity: 480GB disk_type: ssd disk_interface: ssd - disk_rotation: + disk_rotation: 0 - name: 'disk2' disk_capacity: 1TB 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: - pass: + user: root + pass: root remote_management: <<: *remoteparas address: 10.10.180.10 mac_address: "A4:BF:01:16:31:98" interfaces: - - nic: 'nic1' - address: 10.10.180.20/24 + - name: 'nic1' + address: 10.10.180.20 mac_address: "A4:BF:01:16:31:96" vlan: native - - nic: 'nic2' - address: 10.10.181.20/24 + - name: 'nic2' + address: 10.10.181.20 mac_address: "A4:BF:01:16:31:97" vlan: native nodes: @@ -69,7 +70,7 @@ nodes: disk_capacity: 480GB disk_type: ssd disk_interface: ssd - disk_rotation: + disk_rotation: 0 - name: 'disk2' disk_capacity: 1TB disk_type: hdd @@ -77,43 +78,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 - 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 @@ -121,43 +122,43 @@ nodes: disks: *disks remote_management: <<: *remoteparas - address: 10.10.180.12/24 - mac_address: "A4:BF:01:16:31:1G" + 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 - 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 @@ -165,43 +166,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 - 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 @@ -209,43 +210,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 - 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 @@ -253,42 +254,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 - 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/lf/idf-pod2.yaml b/labs/lf/idf-pod2.yaml index 78c916ef..b54e2ce7 100644 --- a/labs/lf/idf-pod2.yaml +++ b/labs/lf/idf-pod2.yaml @@ -1,21 +1,23 @@ ############################################################################## -# Copyright (c) 2017 Enea AB and others. +# Copyright (c) 2018 Linux Foundation, 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 ############################################################################## --- -### LF POD 5 installer descriptor file ### +### LF POD 2 installer descriptor file ### 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 @@ -25,6 +27,7 @@ idf: interface: 0 vlan: 300 network: 10.167.4.0 # Tagged, 'vlan 300' on wiki + ip-range: 10.167.4.10-10.167.4.254 # Some IPs are in use by lab infra mask: 24 storage: interface: 3 @@ -33,13 +36,14 @@ 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: interface: 2 vlan: native network: 172.30.10.0 # Untagged, 'public' on wiki + ip-range: 172.30.10.100-172.30.10.254 # Some IPs are in use by lab infra mask: 24 gateway: 172.30.10.1 dns: @@ -48,21 +52,27 @@ idf: fuel: jumphost: bridges: - admin: '' - mgmt: '' - private: '' - public: '' + admin: 'pxebr' + mgmt: 'br-ctl' + 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 # Ordered-list, index should be in sync with interface index in PDF - - '' - - '' + - 'enp6s0' + - 'enp7s0' + - 'enp8s0' + - 'enp9s0' busaddr: &busaddr # Bus-info reported by `ethtool -i ethX` - - '' - - '' + - '0000:06:00.0' + - '0000:07:00.0' + - '0000:08:00.0' + - '0000:09:00.0' - interfaces: *interfaces busaddr: *busaddr - interfaces: *interfaces diff --git a/labs/lf/idf-pod4.yaml b/labs/lf/idf-pod4.yaml new file mode 100644 index 00000000..c0a1b17e --- /dev/null +++ b/labs/lf/idf-pod4.yaml @@ -0,0 +1,148 @@ +############################################################################## +# Copyright (c) 2018 Linux Foundation, 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 +############################################################################## +--- +### LF POD 4 installer descriptor file ### + +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 + network: 192.168.12.0 + gateway: 192.168.12.1 + dns: 8.8.8.8 + mask: 24 + mgmt: + interface: 1 + vlan: 450 + network: 192.168.3.0 + mask: 24 + storage: + interface: 3 + vlan: 451 + network: 192.168.4.0 + mask: 24 + private: + interface: 2 + vlan: 452 + network: 192.168.5.0 + mask: 24 + public: + interface: 4 + vlan: 414 + network: 172.30.12.64 + mask: 26 + gateway: 172.30.12.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: 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: + admin: 'pxebr' + mgmt: 'br-ctl' + private: ~ + public: ~ + 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 + - 'eno1' + - 'eno3' + - 'eno4' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:04:00.0' + - '0000:02:00.0' + - '0000:02:00.1' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr +xci: + pod_name: lf-pod4 + net_config: *net_config + nodes_roles: + opnfv_host: [opnfv_host] + pod4-node1: [compute, storage] + pod4-node2: [compute, storage] + pod4-node3: [controller, storage] + pod4-node4: [controller, storage] + pod4-node5: [controller, storage] + + # net_config network to be used by the PXE + pxe_network: admin + + # As the MAC of generated bridges are generated, we use a list of local + # bridges to create libvirt networks + jumphost_interfaces_bridges: + - name: br_admin + ip: + + extra_addresses: + opnfv_host: 192.168.12.2 + + # network mapping + network_mapping: + net-mgmt: admin + net-storage: storage + net-internal: private + net-vnf: public + + installers: + osa: *idf_osa diff --git a/labs/lf/idf-pod5.yaml b/labs/lf/idf-pod5.yaml index e0e4af28..01778907 100644 --- a/labs/lf/idf-pod5.yaml +++ b/labs/lf/idf-pod5.yaml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 Enea AB and others. +# Copyright (c) 2018 Linux Foundation, 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,56 +10,62 @@ 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 - network: 10.20.0.128 - mask: 25 - gateway: 10.20.0.129 - dns: 10.20.0.129 + network: 192.168.11.0 + mask: 24 mgmt: interface: 1 vlan: 450 - network: 192.168.0.128 - mask: 25 + network: 192.168.0.0 + mask: 24 storage: interface: 2 vlan: 451 - network: 192.168.1.128 - mask: 25 + network: 192.168.1.0 + mask: 24 private: interface: 1 vlan: 452 - network: 192.168.2.128 - mask: 25 + network: 192.168.2.0 + mask: 24 public: interface: 2 vlan: 415 network: 172.30.13.64 mask: 26 + gateway: 172.30.13.1 + dns: + - 8.8.8.8 + - 8.8.4.4 fuel: jumphost: bridges: - admin: '' - mgmt: '' - private: '' - public: '' + admin: 'pxebr' + mgmt: 'br-ctl' + private: ~ + public: ~ 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 - - '' - - '' + - 'eno1' + - 'eno3' + - 'eno4' busaddr: &busaddr # Bus-info reported by `ethtool -i ethX` - - '' - - '' + - '0000:04:00.0' + - '0000:02:00.0' + - '0000:02:00.1' - interfaces: *interfaces busaddr: *busaddr - interfaces: *interfaces diff --git a/labs/lf/pod2.yaml b/labs/lf/pod2.yaml index eb2efb23..219b2a68 100644 --- a/labs/lf/pod2.yaml +++ b/labs/lf/pod2.yaml @@ -1,6 +1,14 @@ +############################################################################## +# Copyright (c) 2018 Linux Foundation, 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 +############################################################################## --- ### LF POD 2 descriptor file ### +version: 1.0 details: pod_owner: Trevor Bramwell contact: tbramwell@linuxfoundation.org @@ -25,32 +33,14 @@ jumphost: disk_capacity: 2400G disk_type: hdd disk_interface: sas - disk_rotation: + disk_rotation: 0 os: centos-7 remote_params: &remote_params type: ipmi versions: - 2.0 - user: > - ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw - DQYJKoZIhvcNAQEBBQAEggEAKn4rdxFJum3vgvpjT4c64gkXzbMog4LyrBb0 - pHeASLqwiuJqCdELWl4e7d4SMp3QBzHqd6aGHJqywDt09L7axFaW9PmdUEVx - KxIZ8NUdDjl7HtuG8D9irU2n5VMHXVyDosMEZe9pRYhQTkuAggR7EDoDjdDj - 0myGFy/UVH3/fxpdySWhyg9kqAYb1ReMgYBudVfm2gw4bjtjJviwASXi8hj6 - 8isdJPf25U6wrvbqQi5J5WVD4Q3PaGy8GACTZ8n+LFyPSwBl3QJ5jfMmzHmq - Po0cqa4MoKi3xQ8Y8z6DxhUrV0yoYWoHvIcpQBu3YCZVzpOqVPZwsapBl963 - 0d0kWzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAoo59BSqp1DBCu05h+ - /1BZgBDdOvlZ5JlDtpkh73ujYZXR] - pass: > - ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw - DQYJKoZIhvcNAQEBBQAEggEA4pnLYg4U/39mKdytYH1CJYJuJ/qjNrS+KoON - oPU6G9lMJ5U5J7NUuGyBD7O1NTt8VBE+LaBEqmXK5/SQ6mAdns9qs5QLOVSm - r3WKroZdqH3hmW26LuPsXNUfTaCVNOqWPAf6U6Q1fHr1vi09n3mIV/Ph03Kv - /aNeeRsJbBPAtHgCL6aRs+4WoxxYS0eUAVCo4yPDiSN5UFmSg6O304NM2qzi - av2b/gmNFN8AxE5CVi+C/fVGBhdpwmmdC0KmtkY38pYa/hf8Pks4jsFtKNDw - 3KW+pP+BTsgKs/o/WrwCFm4LIJj/E6Pf9qZ/mZ8bAxKlVf+gQj2bgxzT3aa1 - hHhD0TA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBAx3f5XDjWzYJA4Jn5H - KJOBgBDq/YBNdEeyT+dCuH59ZE6L] + user: admin + pass: octopus remote_management: <<: *remote_params address: 172.30.8.83 @@ -59,19 +49,20 @@ jumphost: - mac_address: "00:25:b5:a0:00:1a" speed: 40gb features: 'dpdk|sriov' + address: 192.168.11.1 + name: 'nic1' - mac_address: "00:25:b5:a0:00:1b" speed: 40gb features: 'dpdk|sriov' + name: 'nic2' - mac_address: "00:25:b5:a0:00:1c" speed: 40gb features: 'dpdk|sriov' + name: 'nic3' - mac_address: "00:25:b5:a0:00:1d" speed: 40gb features: 'dpdk|sriov' - fixed_ips: - admin: 192.168.11.1 - mgmt: 10.167.4.1 - public: 172.30.10.72 + name: 'nic4' ############################################################################## nodes: - name: pod2-node1 @@ -93,19 +84,19 @@ nodes: - mac_address: "00:25:b5:a0:00:2a" speed: 40gb features: 'dpdk|sriov' + name: 'nic1' - mac_address: "00:25:b5:a0:00:2b" speed: 40gb features: 'dpdk|sriov' + name: 'nic2' - mac_address: "00:25:b5:a0:00:2c" speed: 40gb features: 'dpdk|sriov' + name: 'nic3' - mac_address: "00:25:b5:a0:00:2d" speed: 40gb features: 'dpdk|sriov' - fixed_ips: - admin: 192.168.11.2 - mgmt: 10.167.4.2 - public: 172.30.10.2 + name: 'nic4' ############################################################################ - name: pod2-node2 node: *nodeparams @@ -118,19 +109,19 @@ nodes: - mac_address: "00:25:b5:a0:00:3a" speed: 40gb features: 'dpdk|sriov' + name: 'nic1' - mac_address: "00:25:b5:a0:00:3b" speed: 40gb features: 'dpdk|sriov' + name: 'nic2' - mac_address: "00:25:b5:a0:00:3c" speed: 40gb features: 'dpdk|sriov' + name: 'nic3' - mac_address: "00:25:b5:a0:00:3d" speed: 40gb features: 'dpdk|sriov' - fixed_ips: - admin: 192.168.11.3 - mgmt: 10.167.4.3 - public: 172.30.10.3 + name: 'nic4' ############################################################################ - name: pod2-node3 node: *nodeparams @@ -143,19 +134,19 @@ nodes: - mac_address: "00:25:b5:a0:00:4a" speed: 40gb features: 'dpdk|sriov' + name: 'nic1' - mac_address: "00:25:b5:a0:00:4b" speed: 40gb features: 'dpdk|sriov' + name: 'nic2' - mac_address: "00:25:b5:a0:00:4c" speed: 40gb features: 'dpdk|sriov' + name: 'nic3' - mac_address: "00:25:b5:a0:00:4d" speed: 40gb features: 'dpdk|sriov' - fixed_ips: - admin: 192.168.11.4 - mgmt: 10.167.4.4 - public: 172.30.10.4 + name: 'nic4' ############################################################################ - name: pod2-node4 node: *nodeparams @@ -168,19 +159,19 @@ nodes: - mac_address: "00:25:b5:a0:00:5a" speed: 40gb features: 'dpdk|sriov' + name: 'nic1' - mac_address: "00:25:b5:a0:00:5b" speed: 40gb features: 'dpdk|sriov' + name: 'nic2' - mac_address: "00:25:b5:a0:00:5c" speed: 40gb features: 'dpdk|sriov' + name: 'nic3' - mac_address: "00:25:b5:a0:00:5d" speed: 40gb features: 'dpdk|sriov' - fixed_ips: - admin: 192.168.11.5 - mgmt: 10.167.4.5 - public: 172.30.10.5 + name: 'nic4' ############################################################################ - name: pod2-node5 node: *nodeparams @@ -193,16 +184,16 @@ nodes: - mac_address: "00:25:b5:a0:00:6a" speed: 40gb features: 'dpdk|sriov' + name: 'nic1' - mac_address: "00:25:b5:a0:00:6b" speed: 40gb features: 'dpdk|sriov' + name: 'nic2' - mac_address: "00:25:b5:a0:00:6c" speed: 40gb features: 'dpdk|sriov' + name: 'nic3' - mac_address: "00:25:b5:a0:00:6d" speed: 40gb features: 'dpdk|sriov' - fixed_ips: - admin: 192.168.11.6 - mgmt: 10.167.4.6 - public: 172.30.10.6 + name: 'nic4' diff --git a/labs/lf/pod4.yaml b/labs/lf/pod4.yaml new file mode 100644 index 00000000..32a51b61 --- /dev/null +++ b/labs/lf/pod4.yaml @@ -0,0 +1,203 @@ +############################################################################## +# Copyright (c) 2018 Linux Foundation, 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 +############################################################################## +--- +### LF POD 4 descriptor file ### + +version: 1.0 +details: + pod_owner: Trevor Bramwell + contact: tbramwell@linuxfoundation.org + lab: Linux Foundation + location: Portland, Oregon, USA + type: development + link: https://wiki.opnfv.org/display/pharos/LF+POD+4 +jumphost: + name: pod4-jump + node: &nodeparams + type: baremetal + vendor: Intel Corporation + model: S2600WT2R + arch: x86_64 + cpus: 88 + cpu_cflags: haswell + cores: 22 + memory: 62G + disks: &disks + - name: 'disk1' + disk_capacity: 480G + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + os: centos-7 + remote_params: &remote_params + type: ipmi + versions: + - 2.0 + user: admin + pass: octopus + remote_management: + <<: *remote_params + address: 172.30.8.83 + mac_address: "a4:bf:01:01:b0:bb" + interfaces: + - &interface_common_nic1 # admin + name: nic1 + speed: 1gb + features: 'dpdk|sriov' + vlan: native + mac_address: "a4:bf:01:01:b0:b9" + address: 192.168.12.1 + - &interface_common_nic2 # mgmt + name: nic2 + speed: 10gb + features: 'dpdk|sriov' + vlan: 450 + mac_address: "00:1e:67:fd:9a:04" + address: 192.168.0.2 + - &interface_common_nic3 # private + name: nic3 + speed: 10gb + features: 'dpdk|sriov' + vlan: 452 + mac_address: "00:1e:67:fd:9a:04" + address: 192.168.2.2 + - &interface_common_nic4 # storage + name: nic4 + speed: 10gb + features: 'dpdk|sriov' + vlan: 451 + mac_address: "00:1e:67:fd:9a:05" + address: 192.168.1.2 + - &interface_common_nic5 # public + name: nic5 + speed: 10gb + features: 'dpdk|sriov' + vlan: 414 + mac_address: "00:1e:67:fd:9a:05" + address: 172.30.12.83 +############################################################################## +nodes: + - name: pod4-node1 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 172.30.8.84 + mac_address: "a4:bf:01:01:ab:b6" + interfaces: + - mac_address: "a4:bf:01:01:ab:b4" + address: 192.168.12.4 + <<: *interface_common_nic1 + - mac_address: "00:1e:67:fd:9b:32" + address: 192.168.0.4 + <<: *interface_common_nic2 + - mac_address: "00:1e:67:fd:9b:32" + address: 192.168.2.4 + <<: *interface_common_nic3 + - mac_address: "00:1e:67:fd:9b:33" + address: 192.168.1.4 + <<: *interface_common_nic4 + - mac_address: "00:1e:67:fd:9b:33" + address: 172.30.12.84 + <<: *interface_common_nic5 + ############################################################################ + - name: pod4-node2 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 172.30.8.85 + mac_address: "a4:bf:01:01:b6:97" + interfaces: + - mac_address: "a4:bf:01:01:b6:95" + address: 192.168.12.5 + <<: *interface_common_nic1 + - mac_address: "00:1e:67:fd:98:e2" + address: 192.168.0.5 + <<: *interface_common_nic2 + - mac_address: "00:1e:67:fd:98:e2" + address: 192.168.2.5 + <<: *interface_common_nic3 + - mac_address: "00:1e:67:fd:98:e3" + address: 192.168.1.5 + <<: *interface_common_nic4 + - mac_address: "00:1e:67:fd:98:e3" + address: 172.30.12.85 + <<: *interface_common_nic5 + ############################################################################ + - name: pod4-node3 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 172.30.8.86 + mac_address: "a4:bf:01:01:66:fe" + interfaces: + - mac_address: "a4:bf:01:01:66:fc" + address: 192.168.12.6 + <<: *interface_common_nic1 + - mac_address: "00:1e:67:fd:9c:c8" + address: 192.168.0.6 + <<: *interface_common_nic2 + - mac_address: "00:1e:67:fd:9c:c8" + address: 192.168.2.6 + <<: *interface_common_nic3 + - mac_address: "00:1e:67:fd:9c:c9" + address: 192.168.1.6 + <<: *interface_common_nic4 + - mac_address: "00:1e:67:fd:9c:c9" + address: 172.30.12.86 + <<: *interface_common_nic5 + ############################################################################ + - name: pod4-node4 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 172.30.8.87 + mac_address: "a4:bf:01:01:b2:f5" + interfaces: + - mac_address: "a4:bf:01:01:b2:f3" + address: 192.168.12.7 + <<: *interface_common_nic1 + - mac_address: "00:1e:67:fd:9b:38" + address: 192.168.0.7 + <<: *interface_common_nic2 + - mac_address: "00:1e:67:fd:9b:38" + address: 192.168.2.7 + <<: *interface_common_nic3 + - mac_address: "00:1e:67:fd:9b:39" + address: 192.168.1.7 + <<: *interface_common_nic4 + - mac_address: "00:1e:67:fd:9b:39" + address: 172.30.12.87 + <<: *interface_common_nic5 + ############################################################################ + - name: pod4-node5 + node: *nodeparams + disks: *disks + remote_management: + <<: *remote_params + address: 172.30.8.88 + mac_address: "a4:bf:01:01:b5:11" + interfaces: + - mac_address: "a4:bf:01:01:b5:0f" + address: 192.168.12.8 + <<: *interface_common_nic1 + - mac_address: "00:1e:67:fd:99:40" + address: 192.168.0.8 + <<: *interface_common_nic2 + - mac_address: "00:1e:67:fd:99:40" + address: 192.168.2.8 + <<: *interface_common_nic3 + - mac_address: "00:1e:67:fd:99:41" + address: 192.168.1.8 + <<: *interface_common_nic4 + - mac_address: "00:1e:67:fd:99:41" + address: 172.30.12.88 + <<: *interface_common_nic5 diff --git a/labs/lf/pod5.yaml b/labs/lf/pod5.yaml index f55e4655..47ebc9e8 100644 --- a/labs/lf/pod5.yaml +++ b/labs/lf/pod5.yaml @@ -1,6 +1,14 @@ +############################################################################## +# Copyright (c) 2018 Linux Foundation, 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 +############################################################################## --- ### LF POD 5 descriptor file ### +version: 1.0 details: pod_owner: Trevor Bramwell contact: tbramwell@linuxfoundation.org @@ -10,7 +18,7 @@ details: link: https://wiki.opnfv.org/display/pharos/LF+POD+5 jumphost: name: pod5-jump - node: &nodeparas + node: &nodeparams type: baremetal vendor: Intel Corporation model: S2600WT2R @@ -24,32 +32,14 @@ jumphost: disk_capacity: 480G disk_type: ssd disk_interface: sata - disk_rotation: + disk_rotation: 0 os: centos-7 remote_params: &remote_params type: ipmi versions: - 2.0 - user: > - ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw - DQYJKoZIhvcNAQEBBQAEggEAR9BS+HE2rTstFbsIQBPMWkmza7bcE+g+6jJG - luOe/dNPi5Ez/ut7fZ28rb4+3cUgvXDLLVDNiBSjUpKa0QbJrybfSNoEuX+f - Sjaxom36hjHDn7J8wTG2T9KAPTxL1Kmc16T2i6cdpv8NUMOKhgwnhgqtYDco - MnOTDJve0tNh4kLDSWo26+KbnQ1HejfGLfNtG6R1fjg6BQMYp8lFo3q7ZRq4 - nR34/mXW39eeiySmMoMmAQg2t21LW5GiHEBSphrUcoPchU6nl/oWOvc2agxb - Tf3hN75vumxN+3PpW8B7hj6TdaNCfmm1OL2WhrSTW1EpQEO0UXxAq7oLAF0D - K62KaTA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBbeaV0wWXX3M668Mh1 - CN+igBBApURxRAFMWQXtgAnbxlhr] - pass: > - ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw - DQYJKoZIhvcNAQEBBQAEggEAFwQbOO4grEw452H7WOAwXN2sb566gisUNhNk - oOPdae4QLTD8Yu/pAjKIoQjyBgtmPwRJlocioIFJ2SpZfjlrVC4fIMULvmFJ - 0CfuG77o950+XIFLdDrxqlEfOg7GetlByi6FdE+x4Cd4bc3SS4o1BIMFFn5R - NP/QeCJGS5RkEi+AcRLzS04Jq+CM0YCbeK0/M5EDBtgSpcQqNSxG9uARKVHy - bXaPso5/1RLwyEMXyMDtTSSJK6etjk4MxZjvMcKDCzSXq1SnrPS+VgjRhI2R - 4Nx1aTm+0mRPtfwsXaaU6YZQLClS93QBQMHb3YsBO7/KqGL5jTpoT6K8AMyc - Q7r/JzA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBBO116CsJoAZzgnxo0Q - R8HRgBBYArsrg4jLeOnZNJP4/yOK] + user: admin + pass: octopus remote_management: <<: *remote_params address: 172.30.8.89 @@ -58,19 +48,19 @@ jumphost: - mac_address: "a4:bf:01:01:ad:71" speed: 1gb features: 'dpdk|sriov' + address: 192.168.11.1 + name: 'nic1' - mac_address: "00:1e:67:fd:9c:c2" speed: 10gb features: 'dpdk|sriov' + name: 'nic2' - mac_address: "00:1e:67:fd:9c:c3" speed: 10gb features: 'dpdk|sriov' - fixed_ips: - admin: 10.20.0.129 - mgmt: 192.168.0.130 - public: 172.30.13.89 + name: 'nic3' nodes: - name: pod5-node1 - node: *nodeparas + node: *nodeparams disks: *disks remote_management: <<: *remote_params @@ -80,18 +70,17 @@ nodes: - mac_address: "a4:bf:01:01:a9:fc" speed: 1gb features: 'dpdk|sriov' + name: 'nic1' - mac_address: "00:1e:67:f6:9b:34" speed: 10gb features: 'dpdk|sriov' + name: 'nic2' - mac_address: "00:1e:67:f6:9b:35" speed: 10gb features: 'dpdk|sriov' - fixed_ips: - admin: 10.20.0.130 - mgmt: 192.168.0.131 - public: 172.30.13.90 + name: 'nic3' - name: pod5-node2 - node: *nodeparas + node: *nodeparams disks: *disks remote_management: <<: *remote_params @@ -101,18 +90,17 @@ nodes: - mac_address: "a4:bf:01:01:a9:d4" speed: 1gb features: 'dpdk|sriov' + name: 'nic1' - mac_address: "00:1e:67:f6:9b:36" speed: 10gb features: 'dpdk|sriov' + name: 'nic2' - mac_address: "00:1e:67:f6:9b:37" speed: 10gb features: 'dpdk|sriov' - fixed_ips: - admin: 10.20.0.131 - mgmt: 192.168.0.132 - public: 172.30.13.91 + name: 'nic3' - name: pod5-node3 - node: *nodeparas + node: *nodeparams disks: *disks remote_management: <<: *remote_params @@ -122,18 +110,17 @@ nodes: - mac_address: "a4:bf:01:00:97:a2" speed: 1gb features: 'dpdk|sriov' + name: 'nic1' - mac_address: "00:1e:67:fd:9c:b0" speed: 10gb features: 'dpdk|sriov' + name: 'nic2' - mac_address: "00:1e:67:fd:9c:b1" speed: 10gb features: 'dpdk|sriov' - fixed_ips: - admin: 10.20.0.132 - mgmt: 192.168.0.133 - public: 172.30.13.92 + name: 'nic3' - name: pod5-node4 - node: *nodeparas + node: *nodeparams disks: *disks remote_management: <<: *remote_params @@ -143,18 +130,17 @@ nodes: - mac_address: "a4:bf:01:01:72:73" speed: 1gb features: 'dpdk|sriov' + name: 'nic1' - mac_address: "00:1e:67:fd:99:24" speed: 10gb features: 'dpdk|sriov' + name: 'nic2' - mac_address: "00:1e:67:fd:99:25" speed: 10gb features: 'dpdk|sriov' - fixed_ips: - admin: 10.20.0.133 - mgmt: 192.168.0.134 - public: 172.30.13.93 + name: 'nic3' - name: pod5-node5 - node: *nodeparas + node: *nodeparams disks: *disks remote_management: <<: *remote_params @@ -164,13 +150,12 @@ nodes: - mac_address: "a4:bf:01:01:74:30" speed: 1gb features: 'dpdk|sriov' + name: 'nic1' - mac_address: "00:1e:67:f6:9b:96" speed: 10gb features: 'dpdk|sriov' + name: 'nic2' - mac_address: "00:1e:67:f6:9b:97" speed: 10gb features: 'dpdk|sriov' - fixed_ips: - admin: 10.20.0.134 - mgmt: 192.168.0.135 - public: 172.30.13.94 + name: 'nic3' diff --git a/labs/nokia/idf-pod1.yaml b/labs/nokia/idf-pod1.yaml new file mode 100644 index 00000000..3fc47e20 --- /dev/null +++ b/labs/nokia/idf-pod1.yaml @@ -0,0 +1,12 @@ +############################################################################## +# Copyright (c) 2018 Nokia, 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 +############################################################################## +--- +idf: + version: 0.1 + # NOTE: Fuel checking is disabled until 'idf.fuel' is defined below + installer: ['apex', 'compass4nfv', 'daisy'] diff --git a/labs/nokia/pod1.yaml b/labs/nokia/pod1.yaml new file mode 100644 index 00000000..6b684aeb --- /dev/null +++ b/labs/nokia/pod1.yaml @@ -0,0 +1,244 @@ +############################################################################## +# Copyright (c) 2018 Nokia, 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 +############################################################################## +--- +### Nokia POD descriptor file ### + +version: 1.0 +details: + pod_owner: Mika Rautakumpu + contact: opnfv-public-lab-admin@list.nokia.com + lab: Nokia Pharos Lab + location: Espoo, Finland + type: development + link: https://wiki.opnfv.org/display/pharos/Nokia+Hosting +########################################################### + +jumphost: + name: nokiapod-jumpserver + node: &nodeparamscomp + type: baremetal + vendor: Intel + model: E5-2680 + arch: x86_64 + cpus: 2 + cpu_cflags: broadwell + cores: 14 + memory: 128G + disks: &disks + - name: 'disk1' + disk_capacity: 1TB + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + - name: 'disk2' + disk_capacity: 1TB + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + os: centos-7 + remote_params: &remote_params + type: ipmi + versions: + - 1.0 + - 2.0 + user: admin + pass: admin + remote_management: + <<: *remote_params + address: 192.168.1.10 + mac_address: "54:ab:3a:14:11:e9" + interfaces: + - mac_address: "90:e2:ba:b0:b6:4d" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic1' + - mac_address: "90:e2:ba:b0:b6:4c" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "54:ab:3a:09:99:06" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "54:ab:3a:09:99:05" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "54:ab:3a:14:11:e8" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "54:ab:3a:14:11:e7" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic6' +#################################################### +nodes: + - name: nokiapod-node1 + node: &nodeparams + type: baremetal + vendor: Intel + model: E5-2630 + arch: x86_64 + cpus: 2 + cpu_cflags: haswell + cores: 8 + memory: 64G + disks: &diskscont + - name: 'disk1' + disk_capacity: 800GB + disk_type: ssd + disk_interface: sata + disk_rotation: 0 + - name: 'disk2' + disk_capacity: 1TB + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + - name: 'disk3' + disk_capacity: 1TB + disk_type: hdd + disk_interface: sata + disk_rotation: 7200 + remote_management: + <<: *remote_params + address: 192.168.1.20 + mac_address: "54:ab:3a:29:18:38" + interfaces: + - mac_address: "54:ab:3a:24:3b:e2" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "54:ab:3a:24:3b:e1" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "54:ab:3a:29:18:37" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "54:ab:3a:29:18:36" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic6' + #################################################### + - name: nokiapod-node2 + node: *nodeparams + disks: *diskscont + remote_management: + <<: *remote_params + address: 192.168.1.21 + mac_address: "54:ab:3a:16:84:45" + interfaces: + - mac_address: "54:ab:3a:24:3f:ac" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "54:ab:3a:24:3f:ab" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "54:ab:3a:16:84:44" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "54:ab:3a:16:84:43" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic6' + #################################################### + - name: nokiapod-node3 + node: *nodeparams + disks: *diskscont + remote_management: + <<: *remote_params + address: 192.168.1.22 + mac_address: "54:ab:3a:16:84:6f" + interfaces: + - mac_address: "54:ab:3a:24:41:be" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "54:ab:3a:24:41:bd" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "54:ab:3a:16:84:6e" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "54:ab:3a:16:84:6d" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic6' + #################################################### + - name: nokiapod-node4 + node: *nodeparamscomp + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.30 + mac_address: "54:ab:3a:13:72:9c" + interfaces: + - mac_address: "90:e2:ba:b0:f2:3d" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic1' + - mac_address: "90:e2:ba:b0:f2:3c" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "54:ab:3a:09:8b:84" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "54:ab:3a:09:8b:83" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "54:ab:3a:13:72:9b" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "54:ab:3a:13:72:9a" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic6' + #################################################### + - name: nokiapod-node5 + node: *nodeparamscomp + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.1.31 + mac_address: "54:ab:3a:13:71:94" + interfaces: + - mac_address: "90:e2:ba:b0:a6:e5" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic1' + - mac_address: "90:e2:ba:b0:a6:e4" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic2' + - mac_address: "54:ab:3a:09:94:ea" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic3' + - mac_address: "54:ab:3a:09:94:e9" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic4' + - mac_address: "54:ab:3a:13:71:93" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic5' + - mac_address: "54:ab:3a:13:71:92" + speed: 10gb + features: 'dpdk|sriov' + name: 'nic6' 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/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/zte/idf-pod1.yaml b/labs/zte/idf-pod1.yaml index 42e5dda0..ff7ad820 100644 --- a/labs/zte/idf-pod1.yaml +++ b/labs/zte/idf-pod1.yaml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 ZTE, Mirantis Inc., Enea AB and others. +# Copyright (c) 2018 ZTE, 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 @@ -10,14 +10,51 @@ 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 + network: 10.10.6.0 + mask: 24 + mgmt: + interface: 1 + vlan: 161 + network: 192.168.61.0 + mask: 24 + storage: + interface: 2 + vlan: 162 + network: 192.168.62.0 + mask: 24 + private: + interface: 3 + vlan: 1120-1150 + network: 192.168.63.0 + mask: 24 + public: + interface: 4 + vlan: 163 + network: 172.60.0.0 + mask: 24 + gateway: 172.60.0.1 + dns: + - 172.10.0.1 fuel: jumphost: bridges: - admin: 'pxebr' + admin: 'br6' mgmt: 'br-mgmt' - private: '' + 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 e8d7f781..2bae8a12 100644 --- a/labs/zte/idf-pod2.yaml +++ b/labs/zte/idf-pod2.yaml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 ZTE, Mirantis Inc., Enea AB and others. +# Copyright (c) 2018 ZTE, 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 @@ -10,6 +10,42 @@ idf: version: 0.1 + # NOTE: Fuel checking is disabled until 'idf.fuel' is defined below + 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 + network: 10.20.7.0 + mask: 24 + mgmt: + interface: 1 + vlan: 171 + network: 192.168.71.0 + mask: 24 + storage: + interface: 2 + vlan: 172 + network: 192.168.72.0 + mask: 24 + private: + interface: 3 + vlan: 1170 + network: 192.168.73.0 + mask: 24 + public: + interface: 4 + vlan: 173 + network: 172.70.0.0 + mask: 24 + gateway: 172.70.0.1 + dns: + - 172.10.0.1 daisy: jumphost: bridges: diff --git a/labs/zte/idf-pod3.yaml b/labs/zte/idf-pod3.yaml index d1bb156e..25b061a6 100644 --- a/labs/zte/idf-pod3.yaml +++ b/labs/zte/idf-pod3.yaml @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2017 ZTE, Mirantis Inc., Enea AB and others. +# Copyright (c) 2018 ZTE, 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 @@ -10,6 +10,42 @@ idf: version: 0.1 + # NOTE: Fuel checking is disabled until 'idf.fuel' is defined below + 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 + network: 10.20.0.0 + mask: 24 + mgmt: + interface: 1 + vlan: 101 + network: 192.168.11.0 + mask: 24 + storage: + interface: 2 + vlan: 102 + network: 192.168.12.0 + mask: 24 + private: + interface: 3 + vlan: native + network: 192.168.13.0 + mask: 24 + public: + interface: 3 + vlan: native + network: 172.10.0.0 + mask: 24 + gateway: 172.10.0.1 + dns: + - 172.10.0.1 daisy: jumphost: bridges: diff --git a/labs/zte/idf-pod9.yaml b/labs/zte/idf-pod9.yaml new file mode 100644 index 00000000..a6c7dfa6 --- /dev/null +++ b/labs/zte/idf-pod9.yaml @@ -0,0 +1,72 @@ +############################################################################## +# Copyright (c) 2018 ZTE, 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 +############################################################################## +--- +### ZTE POD 9 installer descriptor file ### + +idf: + version: 0.1 + # NOTE: For now, only Daisy supports 3-node clusters + installer: ['daisy'] + net_config: + # NOTE: Network names are likely to change after the PDF spec is updated + oob: + interface: 0 + ip-range: 192.168.176.166-192.168.176.168 + vlan: null + mask: 29 + admin: + interface: 0 + vlan: null + network: 10.20.7.0 + mask: 24 + mgmt: + interface: 0 + vlan: null + network: 10.20.7.0 + mask: 24 + storage: + interface: 0 + vlan: null + network: 10.20.7.0 + mask: 24 + private: + interface: 1 + vlan: null + network: 172.70.0.0 + mask: 24 + public: + interface: 1 + vlan: null + network: 172.71.0.0 + mask: 24 + gateway: 172.71.0.1 + dns: + - 172.71.0.1 + daisy: + jumphost: + bridges: + admin: '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 + - 'ens4f0' + - 'ens44f0' + busaddr: &busaddr + # Bus-info reported by `ethtool -i ethX` + - '0000:01:00.0' + - '0000:81:00.0' + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr + - interfaces: *interfaces + busaddr: *busaddr diff --git a/labs/zte/pod1.yaml b/labs/zte/pod1.yaml index 950c2d89..9a4a8a02 100644 --- a/labs/zte/pod1.yaml +++ b/labs/zte/pod1.yaml @@ -1,7 +1,15 @@ +############################################################################## +# Copyright (c) 2018 ZTE, 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 +############################################################################## --- ### ZTE POD 1 descriptor file ### # refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml +version: 1.0 details: pod_owner: Alex Yang contact: yangyang1@zte.com.cn @@ -10,41 +18,6 @@ details: type: production link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab ############################################################################## -net_config: - # NOTE: Network names are likely to change after the PDF spec is updated - oob: - interface: 0 - ip-range: 192.168.1.101-192.168.1.105 - vlan: null - admin: - interface: 0 - vlan: native - network: 10.10.6.0 - mask: 24 - mgmt: - interface: 1 - vlan: 161 - network: 192.168.61.0 - mask: 24 - storage: - interface: 2 - vlan: 162 - network: 192.168.62.0 - mask: 24 - private: - interface: 3 - vlan: 1120 - network: 192.168.63.0 - mask: 24 - public: - interface: 4 - vlan: 163 - network: 172.60.0.0 - mask: 24 - gateway: 172.60.0.1 - dns: - - 172.10.0.1 -############################################################################## jumphost: name: pod1-jump node: @@ -99,15 +72,14 @@ jumphost: 4IoqgBAYdFlBw90sTOBqrhoHmRbr] remote_management: <<: *remote_params - address: - mac_address: + # Not used, fill in with dummy values + address: 0.0.0.0 + mac_address: "00:00:00:00:00:00" interfaces: - mac_address: "74:4a:a4:00:91:b3" speed: 1gb - fixed_ips: - admin: 10.20.6.1 - mgmt: 192.168.61.238 - public: 172.60.0.238 + address: 10.20.6.1 + name: 'nic1' nodes: - name: pod1-node1 node: &nodeparas @@ -138,18 +110,23 @@ nodes: - mac_address: "74:4a:a4:00:cf:dc" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:b0:e1" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:b0:e2" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:b0:dd" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:b0:de" speed: 10gb features: dpdk|sriov + name: 'nic5' - name: pod1-node2 node: *nodeparas disks: *disks @@ -161,18 +138,23 @@ nodes: - mac_address: "74:4a:a4:00:ce:ce" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:d6:ad" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:d6:ae" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:d6:a9" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:d6:aa" speed: 10gb features: dpdk|sriov + name: 'nic5' - name: pod1-node3 node: *nodeparas disks: *disks @@ -184,18 +166,23 @@ nodes: - mac_address: "74:4a:a4:00:cf:58" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:d6:ab" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:d6:ac" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:d6:af" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:d6:b0" speed: 10gb features: dpdk|sriov + name: 'nic5' - name: pod1-node4 node: *nodeparas disks: *disks @@ -207,18 +194,23 @@ nodes: - mac_address: "74:4a:a4:00:49:84" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:b1:a5" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:b1:a6" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:b1:b1" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:b1:b2" speed: 10gb features: dpdk|sriov + name: 'nic5' - name: pod1-node5 node: *nodeparas disks: *disks @@ -230,15 +222,20 @@ nodes: - mac_address: "74:4a:a4:00:ce:c2" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:d6:8d" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:d6:8e" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:d6:9b" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:d6:9c" speed: 10gb features: dpdk|sriov + name: 'nic5' diff --git a/labs/zte/pod2.yaml b/labs/zte/pod2.yaml index 5b3915fe..e5dd5e67 100644 --- a/labs/zte/pod2.yaml +++ b/labs/zte/pod2.yaml @@ -1,7 +1,15 @@ +############################################################################## +# Copyright (c) 2018 ZTE, 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 +############################################################################## --- ### ZTE POD 2 descriptor file ### # refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml +version: 1.0 details: pod_owner: Alex Yang contact: yangyang1@zte.com.cn @@ -10,41 +18,6 @@ details: type: production link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab ############################################################################## -net_config: - # NOTE: Network names are likely to change after the PDF spec is updated - oob: - interface: 0 - ip-range: 192.168.1.106-192.168.1.110 - vlan: null - admin: - interface: 0 - vlan: native - network: 10.20.7.0 - mask: 24 - mgmt: - interface: 1 - vlan: 171 - network: 192.168.71.0 - mask: 24 - storage: - interface: 2 - vlan: 172 - network: 192.168.72.0 - mask: 24 - private: - interface: 3 - vlan: 1170 - network: 192.168.73.0 - mask: 24 - public: - interface: 4 - vlan: 173 - network: 172.70.0.0 - mask: 24 - gateway: 172.70.0.1 - dns: - - 172.10.0.1 -############################################################################## jumphost: name: pod2-jump node: @@ -61,7 +34,7 @@ jumphost: disk_capacity: 600G disk_type: hdd disk_interface: sas - disk_rotation: 10500 + disk_rotation: 10000 - name: 'disk2' disk_capacity: 4000G disk_type: hdd @@ -100,14 +73,14 @@ jumphost: 2+PxgBC5OzeXar0HSyATMD/Z7K0x] remote_management: <<: *remote_params - address: - mac_address: + # Not used, fill in with dummy values + address: 0.0.0.0 + mac_address: "00:00:00:00:00:00" interfaces: - mac_address: "74:4a:a4:00:91:18" speed: 1gb - fixed_ips: - admin: 10.20.7.1 - public: 172.70.0.239 + address: 10.20.7.1 + name: 'nic1' nodes: - name: pod2-node1 node: &nodeparas @@ -138,18 +111,23 @@ nodes: - mac_address: "74:4a:a4:00:cd:72" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:b0:e9" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:b0:ea" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:b0:eb" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:b0:ec" speed: 10gb features: dpdk|sriov + name: 'nic5' - name: pod2-node2 node: *nodeparas disks: *disks @@ -161,18 +139,23 @@ nodes: - mac_address: "74:4a:a4:00:ca:cc" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:d6:a3" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:d6:a4" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:d6:99" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:d6:9a" speed: 10gb features: dpdk|sriov + name: 'nic5' - name: pod2-node3 node: *nodeparas disks: *disks @@ -184,18 +167,23 @@ nodes: - mac_address: "74:4a:a4:00:cd:12" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:d6:9d" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:d6:9e" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:d3:15" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:d3:16" speed: 10gb features: dpdk|sriov + name: 'nic5' - name: pod2-node4 node: *nodeparas disks: *disks @@ -207,18 +195,23 @@ nodes: - mac_address: "74:4a:a4:00:cf:40" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:d6:a5" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:d6:a6" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:d6:a7" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:d6:a8" speed: 10gb features: dpdk|sriov + name: 'nic5' - name: pod2-node5 node: *nodeparas disks: *disks @@ -230,15 +223,20 @@ nodes: - mac_address: "74:4a:a4:00:ce:d4" speed: 1gb features: null + name: 'nic1' - mac_address: "74:4a:a4:00:d2:c3" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:d2:c4" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:d2:c1" speed: 10gb features: dpdk|sriov + name: 'nic4' - mac_address: "74:4a:a4:00:d2:c2" speed: 10gb features: dpdk|sriov + name: 'nic5' diff --git a/labs/zte/pod3.yaml b/labs/zte/pod3.yaml index b44602f2..b6768396 100644 --- a/labs/zte/pod3.yaml +++ b/labs/zte/pod3.yaml @@ -1,7 +1,15 @@ +############################################################################## +# Copyright (c) 2018 ZTE, 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 +############################################################################## --- ### ZTE POD 3 descriptor file ### # refering to https://gerrit.opnfv.org/gerrit/#/c/23727/9/config/pod1.yaml +version: 1.0 details: pod_owner: Alex Yang contact: yangyang1@zte.com.cn @@ -10,41 +18,6 @@ details: type: production link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab ############################################################################## -net_config: - # NOTE: Network names are likely to change after the PDF spec is updated - oob: - interface: 0 - ip-range: 192.168.1.32-192.168.1.36 - vlan: null - admin: - interface: 0 - vlan: native - network: 10.20.0.0 - mask: 24 - mgmt: - interface: 1 - vlan: 101 - network: 192.168.11.0 - mask: 24 - storage: - interface: 2 - vlan: 102 - network: 192.168.12.0 - mask: 24 - private: - interface: 3 - vlan: 1030 - network: 192.168.13.0 - mask: 24 - public: - interface: 3 - vlan: 103 - network: 172.10.0.0 - mask: 24 - gateway: 172.10.0.1 - dns: - - 172.10.0.1 -############################################################################## jumphost: name: pod3-jump node: @@ -99,14 +72,14 @@ jumphost: ZIpvgBCa0QYVwRsEcqVofk2pmPKq] remote_management: <<: *remote_params - address: - mac_address: + # Not used, fill in with dummy values + address: 0.0.0.0 + mac_address: "00:00:00:00:00:00" interfaces: - mac_address: "74:4a:a4:00:21:0c" speed: 1gb - fixed_ips: - admin: 10.20.0.1 - public: 172.10.0.240 + address: 10.20.0.1 + name: 'nic1' nodes: - name: pod3-node1 node: &nodeparas @@ -137,15 +110,19 @@ nodes: - mac_address: "74:4a:a4:00:0b:85" speed: 10gb features: dpdk|sriov + name: 'nic1' - mac_address: "74:4a:a4:00:0b:86" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:0b:87" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:0b:88" speed: 10gb features: dpdk|sriov + name: 'nic4' - name: pod3-node2 node: *nodeparas disks: *disks @@ -157,15 +134,19 @@ nodes: - mac_address: "74:4a:a4:00:5c:5d" speed: 10gb features: dpdk|sriov + name: 'nic1' - mac_address: "74:4a:a4:00:5c:5e" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:5c:5f" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:5c:60" speed: 10gb features: dpdk|sriov + name: 'nic4' - name: pod3-node3 node: *nodeparas disks: *disks @@ -177,15 +158,19 @@ nodes: - mac_address: "74:4a:a4:00:5c:35" speed: 10gb features: dpdk|sriov + name: 'nic1' - mac_address: "74:4a:a4:00:5c:36" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:5c:37" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:5c:38" speed: 10gb features: dpdk|sriov + name: 'nic4' - name: pod3-node4 node: *nodeparas disks: *disks @@ -197,15 +182,19 @@ nodes: - mac_address: "74:4a:a4:00:5c:69" speed: 10gb features: dpdk|sriov + name: 'nic1' - mac_address: "74:4a:a4:00:5c:6a" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:5c:6b" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:5c:6c" speed: 10gb features: dpdk|sriov + name: 'nic4' - name: pod3-node5 node: *nodeparas disks: *disks @@ -217,12 +206,16 @@ nodes: - mac_address: "74:4a:a4:00:5c:6d" speed: 10gb features: dpdk|sriov + name: 'nic1' - mac_address: "74:4a:a4:00:5c:6e" speed: 10gb features: dpdk|sriov + name: 'nic2' - mac_address: "74:4a:a4:00:5c:6f" speed: 10gb features: dpdk|sriov + name: 'nic3' - mac_address: "74:4a:a4:00:5c:70" speed: 10gb features: dpdk|sriov + name: 'nic4' diff --git a/labs/zte/pod9.yaml b/labs/zte/pod9.yaml new file mode 100644 index 00000000..c18d244e --- /dev/null +++ b/labs/zte/pod9.yaml @@ -0,0 +1,143 @@ +############################################################################## +# Copyright (c) 2018 ZTE, 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 +############################################################################## +--- +### ZTE POD 9 descriptor file ### + +version: 1.0 +details: + pod_owner: Zhiijang Hu + contact: huzhijiang@zte.com.cn + lab: ZTE Pharos Lab + location: Nanjing, China + type: production + link: https://wiki.opnfv.org/display/pharos/ZTE+SH+Testlab +############################################################################## +jumphost: + name: pod9-jump + node: + type: baremetal + vendor: ZTE + model: R5300 + arch: x86_64 + cpus: 2 + cpu_cflags: haswell + cores: 12 + memory: 35G + disks: + - name: 'disk1' + disk_capacity: 107G + disk_type: hdd + disk_interface: sas + disk_rotation: 10000 + os: CentOS-7 + remote_params: &remote_params + type: ipmi + versions: + - 2.0 + user: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAIX8TfBkmSFZEE/44AXRKK8ATlkqmfMBcDHM5 + IrDbb8KXzyuKXK82u4KPaCxS1dmQehyba6WHih9euMrDFVTobZ/EIW4cKEvx + oS7DoFRDh3j9+lAE35ggHPWQnkGhgERUuMUtyia4xk+EURG/wO0iQhxrNoUg + fKe1jbuKq4Tr1ldunYJqmxtZn/SwVWiJfoGRIdFGJ0iO6ApVnqDIC+5IeBVv + gm9BLT39o7M37rY/5AQt0SoTRtnQo2kKhjUsp+46LL3/tQBlzZBLCsGwskru + qcZmWlg9SsLePSkqrLBiNeL1EJVu7VRdikKWu43qRLZSMhEQsu6rqkeCviYu + QOkh+TA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBCRBGGIXFDcQnOO1MjU + 36+DgBB7IJHcJciyO0PTGqIs58OH] + pass: > + ENC[PKCS7,MIIBeQYJKoZIhvcNAQcDoIIBajCCAWYCAQAxggEhMIIBHQIBADAFMAACAQEw + DQYJKoZIhvcNAQEBBQAEggEAOnq6dIeck0YPh1OiXSU+gsUKG5cmIlqCB7ks + Jj0F524a8mojWB3GGSi0tdy+ZcBotTgMFm5yV4JaSmUi7f+w+3T5y7e7meKB + MmnuGq8AOKOfSxnI8+sUOcY8zLgNaztZk0dv/PzLydoSc5k+1uqHkakcPBHy + dJW9rWLSKcbFUHSOWI+tcKxx5UYY26BdqNy77YRu5ZnbW1z+xHmpcXuU4XHY + +Dt1qb1EkkOQ9p0wuBRNsn+xCLFNHv5tKod3nsQk0fkPsMSRGY57rSkPs8HI + bmkmoII5biA02bTjtb3jATPoH5mMa7hU8aaZM1qkXCejP2QIDikAgyWeiMp8 + /kt2bjA8BgkqhkiG9w0BBwEwHQYJYIZIAWUDBAEqBBDehpNTtsY3HlqAGCLe + WSgUgBDYj5D5l/12XoUNXxGDebYT] + remote_management: + <<: *remote_params + # Not used, fill in with dummy values + address: 0.0.0.0 + mac_address: "00:00:00:00:00:00" + interfaces: + - mac_address: "00:1b:21:89:30:87" + speed: 10gb + address: 10.20.7.1 + name: 'nic1' +nodes: + - name: pod9-node1 + node: &nodeparas + type: baremetal + vendor: ZTE + model: E9000 + arch: x86_64 + cpus: 2 + cpu_cflags: hasewell + cores: 14 + memory: 128G + disks: + - name: 'disk1' + disk_capacity: 1198G + disk_type: hdd + disk_interface: sas + disk_rotation: 10000 + remote_management: + <<: *remote_params + address: 192.168.176.166 + mac_address: "74:4a:a4:03:bf:93" + interfaces: + - mac_address: "74:4a:a4:03:bf:96" + speed: 1gb + features: null + name: 'nic1' + - mac_address: "74:4a:a4:05:ee:86" + speed: 10gb + features: dpdk|sriov + name: 'nic2' + - name: pod9-node2 + node: *nodeparas + disks: &disks + - name: 'disk1' + disk_capacity: 600G + disk_type: hdd + disk_interface: sas + disk_rotation: 10000 + - name: 'disk2' + disk_capacity: 600G + disk_type: hdd + disk_interface: sas + disk_rotation: 10000 + remote_management: + <<: *remote_params + address: 192.168.176.167 + mac_address: "74:4a:a4:03:bf:c3" + interfaces: + - mac_address: "74:4a:a4:03:bf:c6" + speed: 1gb + features: null + name: 'nic1' + - mac_address: "74:4a:a4:05:ee:9a" + speed: 10gb + features: dpdk|sriov + name: 'nic2' + - name: pod9-node3 + node: *nodeparas + disks: *disks + remote_management: + <<: *remote_params + address: 192.168.176.168 + mac_address: "74:4a:a4:03:bf:fb" + interfaces: + - mac_address: "74:4a:a4:03:bf:fe" + speed: 1gb + features: null + name: 'nic1' + - mac_address: "74:4a:a4:05:ee:7e" + speed: 10gb + features: dpdk|sriov + name: 'nic2' |