summaryrefslogtreecommitdiffstats
path: root/labs/arm
diff options
context:
space:
mode:
Diffstat (limited to 'labs/arm')
-rw-r--r--labs/arm/idf-pod10.yaml148
-rw-r--r--labs/arm/idf-pod5.yaml23
-rw-r--r--labs/arm/idf-pod6.yaml7
-rw-r--r--labs/arm/idf-pod7.yaml7
-rw-r--r--labs/arm/idf-pod8.yaml7
-rw-r--r--labs/arm/idf-pod9.yaml11
-rw-r--r--labs/arm/idf-virtual2.yaml6
-rw-r--r--labs/arm/pod10.yaml322
-rw-r--r--labs/arm/pod5.yaml16
-rw-r--r--labs/arm/virtual2.yaml24
10 files changed, 542 insertions, 29 deletions
diff --git a/labs/arm/idf-pod10.yaml b/labs/arm/idf-pod10.yaml
new file mode 100644
index 00000000..39aac781
--- /dev/null
+++ b/labs/arm/idf-pod10.yaml
@@ -0,0 +1,148 @@
+##############################################################################
+# Copyright (c) 2018 Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+### ARM POD 10 installer descriptor file ###
+
+idf:
+ version: 0.1
+ # NOTE: Compass & Joid are not supported on this POD since they require at
+ # least 3 network ports on all nodes.
+ installer: ['fuel']
+ net_config:
+ oob:
+ ip-range: 10.0.21.2-10.0.21.7
+ vlan: native
+ mask: 24
+ admin:
+ interface: 0
+ vlan: native
+ network: 192.168.11.0
+ mask: 24
+ mgmt:
+ interface: 1
+ vlan: 2443
+ network: 172.16.10.0
+ ip-range: 172.16.10.10-172.16.10.254 # Some IPs are in use by lab infra
+ mask: 24
+ storage:
+ interface: 1
+ vlan: 2444
+ network: 10.2.0.0
+ mask: 24
+ private:
+ interface: 2
+ vlan: 2445-2460
+ network: 10.1.0.0
+ mask: 24
+ public:
+ interface: 1
+ vlan: native
+ network: 10.0.21.0
+ ip-range: 10.0.21.100-10.0.21.253 # Some IPs are in use by lab infra
+ mask: 24
+ gateway: 10.0.21.254
+ dns:
+ - 8.8.8.8
+ - 8.8.4.4
+ fuel:
+ jumphost:
+ bridges:
+ admin: 'admin20_br0'
+ mgmt: 'mgmt20_br0'
+ private: ~
+ public: 'public20_br0'
+ maas:
+ # MaaS timeouts (in minutes)
+ timeout_comissioning: 10
+ timeout_deploying: 25
+ network:
+ ntp_strata_host1: 1.se.pool.ntp.org
+ ntp_strata_host2: 0.se.pool.ntp.org
+ node:
+ # Ordered-list, index should be in sync with node index in PDF
+ - interfaces: &interfaces_intel
+ # Ordered-list, index should be in sync with interface index in PDF
+ - 'eno1'
+ - 'enp5s0f0'
+ - 'enp5s0f1'
+ - 'eno2'
+ - 'eno3'
+ - 'eno4'
+ busaddr: &busaddr_intel
+ # Bus-info reported by `ethtool -i ethX`
+ - '0000:02:00.0'
+ - '0000:05:00.0'
+ - '0000:05:00.1'
+ - '0000:02:00.1'
+ - '0000:03:00.0'
+ - '0000:03:00.1'
+ - interfaces: *interfaces_intel
+ busaddr: *busaddr_intel
+ - interfaces: *interfaces_intel
+ busaddr: *busaddr_intel
+ - interfaces: &interfaces_arm
+ - 'enP5p144s0'
+ - 'enP2p1s0f1'
+ - 'enP2p1s0f2'
+ - 'enP2p1s0f3'
+ - 'enP2p1s0f4'
+ - 'enP2p1s0f5'
+ busaddr: &busaddr_arm
+ - '0005:90:00.0'
+ - '0002:01:00.1'
+ - '0002:01:00.2'
+ - '0002:01:00.3'
+ - '0002:01:00.4'
+ - '0002:01:00.5'
+ - interfaces: *interfaces_arm
+ busaddr: *busaddr_arm
+ reclass:
+ node:
+ - compute_params: &compute_params_intel
+ common:
+ nova_cpu_pinning: &nova_cpu_pinning_common_intel "2-15"
+ compute_hugepages_size: 2M
+ compute_hugepages_count: 8192
+ compute_hugepages_mount: /mnt/hugepages_2M
+ compute_kernel_isolcpu: *nova_cpu_pinning_common_intel
+ dpdk:
+ nova_cpu_pinning: "4-15"
+ compute_hugepages_size: 2M
+ compute_hugepages_count: 8192
+ compute_hugepages_mount: /mnt/hugepages_2M
+ compute_kernel_isolcpu: *nova_cpu_pinning_common_intel
+ compute_dpdk_driver: uio
+ compute_ovs_pmd_cpu_mask: "0xc"
+ compute_ovs_dpdk_socket_mem: "2048"
+ compute_ovs_dpdk_lcore_mask: "0xc"
+ compute_ovs_memory_channels: "2"
+ dpdk0_driver: igb_uio
+ dpdk0_n_rxq: 2
+ - compute_params: *compute_params_intel
+ - compute_params: *compute_params_intel
+ - compute_params: &compute_params_cavium
+ common:
+ nova_cpu_pinning: &nova_cpu_pinning_common_arm "8-47"
+ compute_hugepages_size: 2M
+ compute_hugepages_count: 8192
+ compute_hugepages_mount: /mnt/hugepages_2M
+ compute_kernel_isolcpu: *nova_cpu_pinning_common_arm
+ dpdk:
+ nova_cpu_pinning: "12-47"
+ compute_hugepages_size: 1G
+ compute_hugepages_count: 16
+ compute_hugepages_mount: /mnt/hugepages_1G
+ compute_kernel_isolcpu: *nova_cpu_pinning_common_arm
+ compute_dpdk_driver: vfio
+ compute_ovs_pmd_cpu_mask: "0x300"
+ compute_ovs_dpdk_socket_mem: "2048"
+ compute_ovs_dpdk_lcore_mask: "0xC00"
+ compute_ovs_memory_channels: "2"
+ dpdk0_driver: vfio-pci
+ dpdk0_n_rxq: 2
+ - compute_params: *compute_params_cavium
diff --git a/labs/arm/idf-pod5.yaml b/labs/arm/idf-pod5.yaml
index a5191319..09fe4cb6 100644
--- a/labs/arm/idf-pod5.yaml
+++ b/labs/arm/idf-pod5.yaml
@@ -17,6 +17,7 @@ idf:
oob:
ip-range: 10.0.8.3-10.0.8.10
vlan: native
+ mask: 24
admin:
interface: 0
vlan: native
@@ -34,7 +35,7 @@ idf:
network: 10.2.0.0
mask: 24
private:
- interface: 1
+ interface: 2
vlan: 2185-2200
network: 10.1.0.0
mask: 24
@@ -76,10 +77,18 @@ idf:
busaddr: *busaddr
- interfaces: *interfaces
busaddr: *busaddr
- - interfaces: *interfaces
- busaddr: *busaddr
- - interfaces: *interfaces
- busaddr: *busaddr
+ - interfaces: &interfaces_dual
+ - 'eth0'
+ - 'eth1'
+ - 'enp1s0f0'
+ - 'enp1s0f1'
+ busaddr: &busaddr_dual
+ - 'e0700000.xgmac'
+ - 'e0900000.xgmac'
+ - '0000:01:00.0'
+ - '0000:01:00.1'
+ - interfaces: *interfaces_dual
+ busaddr: *busaddr_dual
reclass:
node:
- compute_params: &compute_params
@@ -95,12 +104,12 @@ idf:
compute_hugepages_count: 8192
compute_hugepages_mount: /mnt/hugepages_2M
compute_kernel_isolcpu: *nova_cpu_pinning_common
- compute_dpdk_driver: vfio
+ compute_dpdk_driver: uio
compute_ovs_pmd_cpu_mask: "0xc"
compute_ovs_dpdk_socket_mem: "4096"
compute_ovs_dpdk_lcore_mask: "0xc"
compute_ovs_memory_channels: "2"
- dpdk0_driver: vfio-pci
+ dpdk0_driver: igb_uio
dpdk0_n_rxq: 2
- compute_params: *compute_params
- compute_params: *compute_params
diff --git a/labs/arm/idf-pod6.yaml b/labs/arm/idf-pod6.yaml
index 395a7fb3..6d6c9c37 100644
--- a/labs/arm/idf-pod6.yaml
+++ b/labs/arm/idf-pod6.yaml
@@ -15,6 +15,7 @@ idf:
oob:
ip-range: 10.0.1.54-10.0.1.58
vlan: native
+ mask: 24
admin:
interface: 0
vlan: native
@@ -97,9 +98,9 @@ idf:
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_hugepages_size: 1G
+ compute_hugepages_count: 16
+ compute_hugepages_mount: /mnt/hugepages_1G
compute_kernel_isolcpu: *nova_cpu_pinning_common
compute_dpdk_driver: vfio
compute_ovs_pmd_cpu_mask: "0x300"
diff --git a/labs/arm/idf-pod7.yaml b/labs/arm/idf-pod7.yaml
index 463a1f7e..2cc681bf 100644
--- a/labs/arm/idf-pod7.yaml
+++ b/labs/arm/idf-pod7.yaml
@@ -17,6 +17,7 @@ idf:
oob:
ip-range: 10.0.16.2-10.0.16.6
vlan: native
+ mask: 24
admin:
interface: 0
vlan: native
@@ -99,9 +100,9 @@ idf:
compute_kernel_isolcpu: *nova_cpu_pinning_common_a
dpdk:
nova_cpu_pinning: "4-47"
- compute_hugepages_size: 2M
- compute_hugepages_count: 8192
- compute_hugepages_mount: /mnt/hugepages_2M
+ compute_hugepages_size: 1G
+ compute_hugepages_count: 16
+ compute_hugepages_mount: /mnt/hugepages_1G
compute_kernel_isolcpu: *nova_cpu_pinning_common_a
compute_dpdk_driver: vfio
compute_ovs_pmd_cpu_mask: "0xc"
diff --git a/labs/arm/idf-pod8.yaml b/labs/arm/idf-pod8.yaml
index e9464846..f5ef7241 100644
--- a/labs/arm/idf-pod8.yaml
+++ b/labs/arm/idf-pod8.yaml
@@ -15,6 +15,7 @@ idf:
oob:
ip-range: 10.0.19.2-10.0.19.7
vlan: native
+ mask: 24
admin:
interface: 0
vlan: native
@@ -95,9 +96,9 @@ idf:
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_hugepages_size: 1G
+ compute_hugepages_count: 16
+ compute_hugepages_mount: /mnt/hugepages_1G
compute_kernel_isolcpu: *nova_cpu_pinning_common
compute_dpdk_driver: vfio
compute_ovs_pmd_cpu_mask: "0x300"
diff --git a/labs/arm/idf-pod9.yaml b/labs/arm/idf-pod9.yaml
index 3b930793..b6252d36 100644
--- a/labs/arm/idf-pod9.yaml
+++ b/labs/arm/idf-pod9.yaml
@@ -15,6 +15,7 @@ idf:
oob:
ip-range: 10.0.20.2-10.0.20.7
vlan: native
+ mask: 24
admin:
interface: 0
vlan: native
@@ -55,8 +56,8 @@ idf:
public: 'public19_br0'
maas:
# MaaS timeouts (in minutes)
- timeout_comissioning: 10
- timeout_deploying: 18
+ timeout_comissioning: 14
+ timeout_deploying: 24
network:
node:
# Ordered-list, index should be in sync with node index in PDF
@@ -99,9 +100,9 @@ idf:
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_hugepages_size: 1G
+ compute_hugepages_count: 16
+ compute_hugepages_mount: /mnt/hugepages_1G
compute_kernel_isolcpu: *nova_cpu_pinning_common
compute_dpdk_driver: vfio
compute_ovs_pmd_cpu_mask: "0x300"
diff --git a/labs/arm/idf-virtual2.yaml b/labs/arm/idf-virtual2.yaml
index 0cc24974..85529187 100644
--- a/labs/arm/idf-virtual2.yaml
+++ b/labs/arm/idf-virtual2.yaml
@@ -15,6 +15,7 @@ idf:
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:
@@ -26,6 +27,7 @@ idf:
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
@@ -34,13 +36,14 @@ idf:
mask: 24
private:
interface: 2
- vlan: native
+ vlan: 1000-1999
network: 10.1.0.0
mask: 24
public:
interface: 3
vlan: native
network: 10.0.9.0
+ ip-range: 10.0.9.100-10.0.9.253 # Some IPs are in use by lab infra
mask: 24
gateway: 10.0.9.254
dns:
@@ -54,6 +57,7 @@ idf:
private: ~
public: 'public'
network:
+ interface_mtu: 9000
ntp_strata_host1: 1.se.pool.ntp.org
ntp_strata_host2: 0.se.pool.ntp.org
node:
diff --git a/labs/arm/pod10.yaml b/labs/arm/pod10.yaml
new file mode 100644
index 00000000..0199c584
--- /dev/null
+++ b/labs/arm/pod10.yaml
@@ -0,0 +1,322 @@
+##############################################################################
+# Copyright (c) 2018 Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+### Enea ARM POD 10 descriptor file ###
+
+version: 1.0
+details:
+ pod_owner: ENEA AB
+ contact: dan.lilliehorn@enea.com
+ lab: ENEA lab
+ location: Stockholm, Sweden
+ type: production
+ link: https://wiki.opnfv.org/display/pharos/Enea+Hosting
+##############################################################################
+jumphost:
+ name: jenkins-slave-arm-pod10
+ node:
+ type: baremetal
+ vendor: Dell
+ model: PowerEdge R440
+ arch: x86_64
+ cpus: 1
+ cpu_cflags: skylake
+ cores: 16
+ memory: 96GB
+ disks:
+ - name: disk1
+ disk_capacity: 240G
+ disk_type: ssd
+ disk_interface: sata
+ disk_rotation: 0
+ - name: disk2
+ disk_capacity: 2T
+ disk_type: hdd
+ disk_interface: sata
+ disk_rotation: 7200
+ os: ubuntu-16.04
+ remote_params: &remote_params
+ type: ipmi
+ versions:
+ - 2.0
+ user: ADMIN
+ pass: ADMIN
+ remote_management:
+ <<: *remote_params
+ address: 10.0.21.7
+ mac_address: "D0:94:66:87:55:32"
+ interfaces:
+ # eno1
+ - mac_address: "d0:94:66:87:55:38"
+ speed: 1gb
+ features: ''
+ name: 'nic1'
+ # eno2
+ - mac_address: "d0:94:66:87:55:39"
+ speed: 1gb
+ features: ''
+ name: 'nic2'
+##############################################################################
+nodes:
+ - name: intel2660-1
+ node: &nodeparams
+ type: baremetal
+ vendor: Dell
+ model: PowerEdge R430
+ arch: x86_64
+ cpus: 1
+ cpu_cflags: 'sandy bridge'
+ cores: 14
+ memory: 128GB
+ disks: &disks
+ - name: 'disk1'
+ disk_capacity: 240G
+ disk_type: ssd
+ disk_interface: sata
+ disk_rotation: 0
+ - name: 'disk2'
+ disk_capacity: 240G
+ disk_type: ssd
+ disk_interface: sata
+ disk_rotation: 0
+ - name: 'disk3'
+ disk_capacity: 1T
+ disk_type: ssd
+ disk_interface: sata
+ disk_rotation: 7200
+ - name: 'disk4'
+ disk_capacity: 1T
+ disk_type: hdd
+ disk_interface: sata
+ disk_rotation: 7200
+ remote_management:
+ <<: *remote_params
+ address: 10.0.21.2
+ mac_address: "D0:94:66:58:8C:A8"
+ interfaces:
+ # eno1
+ - mac_address: "D0:94:66:58:8C:A4"
+ speed: 1gb
+ features: ''
+ name: 'nic1'
+ # enp5s0f0
+ - mac_address: "B4:96:91:31:9D:44"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic2'
+ # enp5s0f1
+ - mac_address: "B4:96:91:31:9D:46"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic3'
+ # eno2 UNUSED
+ - mac_address: "D0:94:66:58:8C:A5"
+ speed: 1gb
+ features: ''
+ name: 'nic4'
+ # eno3 UNUSED
+ - mac_address: "D0:94:66:58:8C:A6"
+ speed: 1gb
+ features: ''
+ name: 'nic5'
+ # eno4 UNUSED
+ - mac_address: "D0:94:66:58:8C:A7"
+ speed: 1gb
+ features: ''
+ name: 'nic6'
+ ############################################################################
+ - name: intel2660-2
+ node: *nodeparams
+ disks: *disks
+ remote_management:
+ <<: *remote_params
+ address: 10.0.21.3
+ mac_address: "D0:94:66:6D:9A:DE"
+ interfaces:
+ # eno1
+ - mac_address: "D0:94:66:6D:9A:DA"
+ speed: 1gb
+ features: ''
+ name: 'nic1'
+ # enp5s0f0
+ - mac_address: "B4:96:91:31:9C:64"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic2'
+ # enp5s0f1
+ - mac_address: "B4:96:91:31:9C:66"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic3'
+ # eno2 UNUSED
+ - mac_address: "D0:94:66:6D:9A:DB"
+ speed: 1gb
+ features: ''
+ name: 'nic4'
+ # eno3 UNUSED
+ - mac_address: "D0:94:66:6D:9A:DC"
+ speed: 1gb
+ features: ''
+ name: 'nic5'
+ # eno4 UNUSED
+ - mac_address: "D0:94:66:6D:9A:DD"
+ speed: 1gb
+ features: ''
+ name: 'nic6'
+ ############################################################################
+ - name: intel2660-3
+ node: *nodeparams
+ disks: *disks
+ remote_management:
+ <<: *remote_params
+ address: 10.0.21.4
+ mac_address: "D0:94:66:58:9E:DF"
+ interfaces:
+ # eno1
+ - mac_address: "D0:94:66:58:9E:DB"
+ speed: 1gb
+ features: ''
+ name: 'nic1'
+ # enp5s0f0
+ - mac_address: "B4:96:91:31:9C:9C"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic2'
+ # enp5s0f1
+ - mac_address: "B4:96:91:31:9C:9E"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic3'
+ # eno2 UNUSED
+ - mac_address: "D0:94:66:58:9E:DC"
+ speed: 1gb
+ features: ''
+ name: 'nic4'
+ # eno3 UNUSED
+ - mac_address: "D0:94:66:58:9E:DD"
+ speed: 1gb
+ features: ''
+ name: 'nic5'
+ # eno4 UNUSED
+ - mac_address: "D0:94:66:58:9E:DE"
+ speed: 1gb
+ features: ''
+ name: 'nic6'
+ ############################################################################
+ - name: cn8890-14
+ node:
+ type: baremetal
+ vendor: Cavium
+ model: ThunderX
+ arch: aarch64
+ cpus: 1
+ cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32
+ cores: 48
+ memory: 128G
+ disks:
+ - name: 'disk1'
+ disk_capacity: 240G
+ disk_type: ssd
+ disk_interface: sata
+ disk_rotation: 0
+ remote_management:
+ type: ipmi
+ versions:
+ - 2.0
+ user: ADMIN
+ pass: ADMIN
+ address: 10.0.21.5
+ mac_address: "1c:1b:0d:60:ed:9b"
+ interfaces:
+ # enP5144s0, Connected, used only for admin/PXE
+ - mac_address: "68:05:ca:42:cb:e5"
+ speed: 1gb
+ features: ''
+ name: 'nic1'
+ # enP2p1s0f1, Connected, trunk for all other VLANs
+ - mac_address: "1c:1b:0d:60:ed:96"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic2'
+ # enP2p1s0f2, private
+ - mac_address: "1c:1b:0d:60:ed:97"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic3'
+ # enP2p1s0f3, Not connected
+ - mac_address: "1c:1b:0d:60:ed:98"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic4'
+ # enP2p1s0f4, Not connected
+ - mac_address: "1c:1b:0d:60:ed:99"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic4'
+ # enP2p1s0f5, Not connected
+ - mac_address: "1c:1b:0d:60:ed:9a"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ name: 'nic4'
+
+ ############################################################################
+ - name: cn8890-15
+ node:
+ type: baremetal
+ vendor: Cavium
+ model: ThunderX
+ arch: aarch64
+ cpus: 1
+ cpu_cflags: fp asimd evtstrm aes pmull sha1 sha2 crc32
+ cores: 48
+ memory: 64G
+ disks:
+ - name: 'disk1'
+ disk_capacity: 240G
+ disk_type: ssd
+ disk_interface: sata
+ disk_rotation: 0
+ remote_management:
+ type: ipmi
+ versions:
+ - 2.0
+ user: ADMIN
+ pass: ADMIN
+ address: 10.0.21.6
+ mac_address: "1c:1b:0d:60:ed:b7"
+ interfaces:
+ # enP5p144s0
+ - mac_address: "68:05:ca:42:cb:e8"
+ speed: 1gb
+ features: ''
+ name: 'nic1'
+ # enP2p1s0f1
+ - mac_address: "1c:1b:0d:60:ed:b2"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic2'
+ # enP2p1s0f2
+ - mac_address: "1c:1b:0d:60:ed:b3"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic3'
+ # enP2p1s0f3, Not connected
+ - mac_address: "1c:1b:0d:60:ed:b4"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic4'
+ # enP2p1s0f4, Not connected
+ - mac_address: "1c:1b:0d:60:ed:b5"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic5'
+ # enP2p1s0f5, Not connected
+ - mac_address: "1c:1b:0d:60:ed:b6"
+ speed: 40gb
+ features: 'dpdk|sriov'
+ name: 'nic6'
diff --git a/labs/arm/pod5.yaml b/labs/arm/pod5.yaml
index 3a55678e..35d46017 100644
--- a/labs/arm/pod5.yaml
+++ b/labs/arm/pod5.yaml
@@ -156,6 +156,14 @@ nodes:
speed: 10gb
features: ''
name: 'nic2'
+ - mac_address: "ac:1f:6b:8a:82:84"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic3'
+ - mac_address: "ac:1f:6b:8a:82:85"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic4'
############################################################################
- name: softiron-7
node: *nodeparams
@@ -173,3 +181,11 @@ nodes:
speed: 10gb
features: ''
name: 'nic2'
+ - mac_address: "ac:1f:6b:8a:82:a0"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic3'
+ - mac_address: "ac:1f:6b:8a:82:a1"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ name: 'nic4'
diff --git a/labs/arm/virtual2.yaml b/labs/arm/virtual2.yaml
index 3c2b3b10..f19a5de6 100644
--- a/labs/arm/virtual2.yaml
+++ b/labs/arm/virtual2.yaml
@@ -33,7 +33,7 @@ jumphost:
disk_capacity: 500G
disk_type: hdd
disk_interface: sata
- disk_rotation: 7200
+ disk_rotation: &diskrotation 7200
os: ubuntu-16.04
remote_params: &remote_params
type: ipmi
@@ -92,22 +92,22 @@ nodes:
address: 'qemu:///system'
interfaces: &interfaces
- name: 'nic1'
- speed: 10gb
+ speed: 1gb
features: 'dpdk|sriov'
mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt
vlan: native
- name: 'nic2'
- speed: 10gb
+ speed: 1gb
features: 'dpdk|sriov'
mac_address: "00:00:00:00:00:00"
vlan: native
- name: 'nic3'
- speed: 10gb
+ speed: 1gb
features: 'dpdk|sriov'
mac_address: "00:00:00:00:00:00"
vlan: native
- name: 'nic4'
- speed: 10gb
+ speed: 1gb
features: 'dpdk|sriov'
mac_address: "00:00:00:00:00:00"
vlan: native
@@ -126,12 +126,22 @@ nodes:
############################################################################
- name: node-4
node: *nodeparams
- disks: *disks
+ disks: &compute_disks
+ - name: 'disk1'
+ disk_capacity: 100G
+ disk_type: hdd
+ disk_interface: scsi # virtio-scsi
+ disk_rotation: *diskrotation
+ - name: 'disk2'
+ disk_capacity: 100G
+ disk_type: hdd
+ disk_interface: scsi # virtio-scsi
+ disk_rotation: *diskrotation
remote_management: *remotemgmt
interfaces: *interfaces
############################################################################
- name: node-5
node: *nodeparams
- disks: *disks
+ disks: *compute_disks
remote_management: *remotemgmt
interfaces: *interfaces