summaryrefslogtreecommitdiffstats
path: root/labs
diff options
context:
space:
mode:
Diffstat (limited to 'labs')
-rw-r--r--labs/arm/idf-pod10.yaml26
-rw-r--r--labs/arm/idf-pod6.yaml6
-rw-r--r--labs/arm/idf-pod7.yaml6
-rw-r--r--labs/arm/idf-pod8.yaml6
-rw-r--r--labs/arm/idf-pod9.yaml6
-rw-r--r--labs/arm/idf-virtual2.yaml3
-rw-r--r--labs/arm/pod10.yaml63
-rw-r--r--labs/arm/virtual2.yaml24
-rw-r--r--labs/ericsson/idf-virtual-pod1bl01.yaml5
-rw-r--r--labs/ericsson/idf-virtual1.yaml5
-rw-r--r--labs/ericsson/idf-virtual2.yaml5
-rw-r--r--labs/ericsson/idf-virtual3.yaml5
-rw-r--r--labs/ericsson/idf-virtual4.yaml5
-rw-r--r--labs/ericsson/idf-virtual5.yaml5
-rw-r--r--labs/ericsson/virtual-pod1bl01.yaml24
-rw-r--r--labs/ericsson/virtual1.yaml24
-rw-r--r--labs/ericsson/virtual2.yaml24
-rw-r--r--labs/ericsson/virtual3.yaml24
-rw-r--r--labs/ericsson/virtual4.yaml24
-rw-r--r--labs/ericsson/virtual5.yaml25
-rw-r--r--labs/intel/idf-pod18.yaml2
-rw-r--r--labs/itri/idf-pod1.yaml92
-rw-r--r--labs/itri/pod1.yaml295
-rw-r--r--labs/unh/idf-virtual1.yaml105
-rw-r--r--labs/unh/virtual1.yaml164
25 files changed, 854 insertions, 119 deletions
diff --git a/labs/arm/idf-pod10.yaml b/labs/arm/idf-pod10.yaml
index 836f2da7..39aac781 100644
--- a/labs/arm/idf-pod10.yaml
+++ b/labs/arm/idf-pod10.yaml
@@ -59,7 +59,7 @@ idf:
maas:
# MaaS timeouts (in minutes)
timeout_comissioning: 10
- timeout_deploying: 15
+ timeout_deploying: 25
network:
ntp_strata_host1: 1.se.pool.ntp.org
ntp_strata_host2: 0.se.pool.ntp.org
@@ -85,30 +85,22 @@ idf:
busaddr: *busaddr_intel
- interfaces: *interfaces_intel
busaddr: *busaddr_intel
- - interfaces:
- - 'enP5s3'
- - 'enP2p1s0f1'
- - 'enP2p1s0f2'
- - 'enP2p1s0f3'
- busaddr:
- - '0005:90:00.0'
- - '0002:01:00.1'
- - '0002:01:00.2'
- - '0002:01:00.3'
- - interfaces:
+ - interfaces: &interfaces_arm
- 'enP5p144s0'
- 'enP2p1s0f1'
- 'enP2p1s0f2'
- 'enP2p1s0f3'
- 'enP2p1s0f4'
- 'enP2p1s0f5'
- busaddr:
+ 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
@@ -126,7 +118,7 @@ idf:
compute_kernel_isolcpu: *nova_cpu_pinning_common_intel
compute_dpdk_driver: uio
compute_ovs_pmd_cpu_mask: "0xc"
- compute_ovs_dpdk_socket_mem: "1024"
+ compute_ovs_dpdk_socket_mem: "2048"
compute_ovs_dpdk_lcore_mask: "0xc"
compute_ovs_memory_channels: "2"
dpdk0_driver: igb_uio
@@ -142,9 +134,9 @@ idf:
compute_kernel_isolcpu: *nova_cpu_pinning_common_arm
dpdk:
nova_cpu_pinning: "12-47"
- compute_hugepages_size: 2M
- compute_hugepages_count: 8192
- compute_hugepages_mount: /mnt/hugepages_2M
+ compute_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"
diff --git a/labs/arm/idf-pod6.yaml b/labs/arm/idf-pod6.yaml
index e07c2ea3..6d6c9c37 100644
--- a/labs/arm/idf-pod6.yaml
+++ b/labs/arm/idf-pod6.yaml
@@ -98,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 d21fd875..2cc681bf 100644
--- a/labs/arm/idf-pod7.yaml
+++ b/labs/arm/idf-pod7.yaml
@@ -100,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 2b0146ac..f5ef7241 100644
--- a/labs/arm/idf-pod8.yaml
+++ b/labs/arm/idf-pod8.yaml
@@ -96,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 27ae3cdb..b6252d36 100644
--- a/labs/arm/idf-pod9.yaml
+++ b/labs/arm/idf-pod9.yaml
@@ -100,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 fa83e191..85529187 100644
--- a/labs/arm/idf-virtual2.yaml
+++ b/labs/arm/idf-virtual2.yaml
@@ -36,7 +36,7 @@ idf:
mask: 24
private:
interface: 2
- vlan: native
+ vlan: 1000-1999
network: 10.1.0.0
mask: 24
public:
@@ -57,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
index 4f02aad4..0199c584 100644
--- a/labs/arm/pod10.yaml
+++ b/labs/arm/pod10.yaml
@@ -208,7 +208,7 @@ nodes:
features: ''
name: 'nic6'
############################################################################
- - name: cn8890-10
+ - name: cn8890-14
node:
type: baremetal
vendor: Cavium
@@ -220,41 +220,52 @@ nodes:
memory: 128G
disks:
- name: 'disk1'
- disk_capacity: 500G
- disk_type: hdd
+ disk_capacity: 240G
+ disk_type: ssd
disk_interface: sata
- disk_rotation: 7200
+ disk_rotation: 0
remote_management:
type: ipmi
versions:
- 2.0
- user: admin
- pass: admin
+ user: ADMIN
+ pass: ADMIN
address: 10.0.21.5
- mac_address: "40:8D:5C:BA:B9:65"
+ mac_address: "1c:1b:0d:60:ed:9b"
interfaces:
- # enP5s3, Connected, used only for admin/PXE
- - mac_address: "68:05:ca:3d:93:0f"
+ # enP5144s0, Connected, used only for admin/PXE
+ - mac_address: "68:05:ca:42:cb:e5"
speed: 1gb
features: ''
name: 'nic1'
- # enP2p1s0f2, Connected, trunk for all other VLANs
- - mac_address: "00:0f:b7:07:00:c1"
+ # enP2p1s0f1, Connected, trunk for all other VLANs
+ - mac_address: "1c:1b:0d:60:ed:96"
speed: 10gb
features: 'dpdk|sriov'
name: 'nic2'
- # enP2p1s0f1, Not connected
- - mac_address: "00:0f:b7:07:00:c2"
+ # enP2p1s0f2, private
+ - mac_address: "1c:1b:0d:60:ed:97"
speed: 10gb
features: 'dpdk|sriov'
name: 'nic3'
# enP2p1s0f3, Not connected
- - mac_address: "00:0f:b7:07:00:c0"
+ - 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-23
+ - name: cn8890-15
node:
type: baremetal
vendor: Cavium
@@ -266,7 +277,7 @@ nodes:
memory: 64G
disks:
- name: 'disk1'
- disk_capacity: 480G
+ disk_capacity: 240G
disk_type: ssd
disk_interface: sata
disk_rotation: 0
@@ -277,35 +288,35 @@ nodes:
user: ADMIN
pass: ADMIN
address: 10.0.21.6
- mac_address: "1c:1b:0d:e8:fb:b7"
+ mac_address: "1c:1b:0d:60:ed:b7"
interfaces:
# enP5p144s0
- - mac_address: "68:05:ca:5a:c3:b9"
+ - mac_address: "68:05:ca:42:cb:e8"
speed: 1gb
features: ''
name: 'nic1'
# enP2p1s0f1
- - mac_address: "1c:1b:0d:e8:fb:af"
+ - mac_address: "1c:1b:0d:60:ed:b2"
speed: 10gb
features: 'dpdk|sriov'
name: 'nic2'
# enP2p1s0f2
- - mac_address: "1c:1b:0d:e8:fb:b0"
+ - mac_address: "1c:1b:0d:60:ed:b3"
speed: 10gb
features: 'dpdk|sriov'
name: 'nic3'
- # enP2p1s0f3
- - mac_address: "1c:1b:0d:e8:fb:b1"
+ # enP2p1s0f3, Not connected
+ - mac_address: "1c:1b:0d:60:ed:b4"
speed: 10gb
features: 'dpdk|sriov'
name: 'nic4'
- # enP2p1s0f4
- - mac_address: "1c:1b:0d:e8:fb:b2"
+ # enP2p1s0f4, Not connected
+ - mac_address: "1c:1b:0d:60:ed:b5"
speed: 10gb
features: 'dpdk|sriov'
name: 'nic5'
- # enP2p1s0f5
- - mac_address: "1c:1b:0d:e8:fb:b3"
+ # enP2p1s0f5, Not connected
+ - mac_address: "1c:1b:0d:60:ed:b6"
speed: 40gb
features: 'dpdk|sriov'
name: 'nic6'
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
diff --git a/labs/ericsson/idf-virtual-pod1bl01.yaml b/labs/ericsson/idf-virtual-pod1bl01.yaml
index 528152cb..62db57d4 100644
--- a/labs/ericsson/idf-virtual-pod1bl01.yaml
+++ b/labs/ericsson/idf-virtual-pod1bl01.yaml
@@ -58,6 +58,7 @@ idf:
private: ~
public: ~
network:
+ interface_mtu: 9000
ntp_strata_host1: 1.se.pool.ntp.org
ntp_strata_host2: 0.se.pool.ntp.org
node:
@@ -87,13 +88,13 @@ idf:
- compute_params: &compute_params
common: &compute_params_common
compute_hugepages_size: 2M
- compute_hugepages_count: 2048
+ compute_hugepages_count: 5120
compute_hugepages_mount: /mnt/hugepages_2M
dpdk:
<<: *compute_params_common
compute_dpdk_driver: uio
compute_ovs_pmd_cpu_mask: "0x6"
- compute_ovs_dpdk_socket_mem: "1024"
+ compute_ovs_dpdk_socket_mem: "3072"
compute_ovs_dpdk_lcore_mask: "0x8"
compute_ovs_memory_channels: "2"
dpdk0_driver: igb_uio
diff --git a/labs/ericsson/idf-virtual1.yaml b/labs/ericsson/idf-virtual1.yaml
index e7ba00fb..2a997c38 100644
--- a/labs/ericsson/idf-virtual1.yaml
+++ b/labs/ericsson/idf-virtual1.yaml
@@ -58,6 +58,7 @@ idf:
private: ~
public: ~
network:
+ interface_mtu: 9000
ntp_strata_host1: 1.se.pool.ntp.org
ntp_strata_host2: 0.se.pool.ntp.org
node:
@@ -87,13 +88,13 @@ idf:
- compute_params: &compute_params
common: &compute_params_common
compute_hugepages_size: 2M
- compute_hugepages_count: 2048
+ compute_hugepages_count: 5120
compute_hugepages_mount: /mnt/hugepages_2M
dpdk:
<<: *compute_params_common
compute_dpdk_driver: uio
compute_ovs_pmd_cpu_mask: "0x6"
- compute_ovs_dpdk_socket_mem: "1024"
+ compute_ovs_dpdk_socket_mem: "3072"
compute_ovs_dpdk_lcore_mask: "0x8"
compute_ovs_memory_channels: "2"
dpdk0_driver: igb_uio
diff --git a/labs/ericsson/idf-virtual2.yaml b/labs/ericsson/idf-virtual2.yaml
index 586661a4..1b200778 100644
--- a/labs/ericsson/idf-virtual2.yaml
+++ b/labs/ericsson/idf-virtual2.yaml
@@ -58,6 +58,7 @@ idf:
private: ~
public: ~
network:
+ interface_mtu: 9000
ntp_strata_host1: 1.se.pool.ntp.org
ntp_strata_host2: 0.se.pool.ntp.org
node:
@@ -87,13 +88,13 @@ idf:
- compute_params: &compute_params
common: &compute_params_common
compute_hugepages_size: 2M
- compute_hugepages_count: 2048
+ compute_hugepages_count: 5120
compute_hugepages_mount: /mnt/hugepages_2M
dpdk:
<<: *compute_params_common
compute_dpdk_driver: uio
compute_ovs_pmd_cpu_mask: "0x6"
- compute_ovs_dpdk_socket_mem: "1024"
+ compute_ovs_dpdk_socket_mem: "3072"
compute_ovs_dpdk_lcore_mask: "0x8"
compute_ovs_memory_channels: "2"
dpdk0_driver: igb_uio
diff --git a/labs/ericsson/idf-virtual3.yaml b/labs/ericsson/idf-virtual3.yaml
index 4a7aa82d..86d7b3b0 100644
--- a/labs/ericsson/idf-virtual3.yaml
+++ b/labs/ericsson/idf-virtual3.yaml
@@ -58,6 +58,7 @@ idf:
private: ~
public: ~
network:
+ interface_mtu: 9000
ntp_strata_host1: 1.se.pool.ntp.org
ntp_strata_host2: 0.se.pool.ntp.org
node:
@@ -87,13 +88,13 @@ idf:
- compute_params: &compute_params
common: &compute_params_common
compute_hugepages_size: 2M
- compute_hugepages_count: 2048
+ compute_hugepages_count: 5120
compute_hugepages_mount: /mnt/hugepages_2M
dpdk:
<<: *compute_params_common
compute_dpdk_driver: uio
compute_ovs_pmd_cpu_mask: "0x6"
- compute_ovs_dpdk_socket_mem: "1024"
+ compute_ovs_dpdk_socket_mem: "3072"
compute_ovs_dpdk_lcore_mask: "0x8"
compute_ovs_memory_channels: "2"
dpdk0_driver: igb_uio
diff --git a/labs/ericsson/idf-virtual4.yaml b/labs/ericsson/idf-virtual4.yaml
index ddcd621c..6d93173b 100644
--- a/labs/ericsson/idf-virtual4.yaml
+++ b/labs/ericsson/idf-virtual4.yaml
@@ -58,6 +58,7 @@ idf:
private: ~
public: ~
network:
+ interface_mtu: 9000
ntp_strata_host1: 1.se.pool.ntp.org
ntp_strata_host2: 0.se.pool.ntp.org
node:
@@ -87,13 +88,13 @@ idf:
- compute_params: &compute_params
common: &compute_params_common
compute_hugepages_size: 2M
- compute_hugepages_count: 2048
+ compute_hugepages_count: 5120
compute_hugepages_mount: /mnt/hugepages_2M
dpdk:
<<: *compute_params_common
compute_dpdk_driver: uio
compute_ovs_pmd_cpu_mask: "0x6"
- compute_ovs_dpdk_socket_mem: "1024"
+ compute_ovs_dpdk_socket_mem: "3072"
compute_ovs_dpdk_lcore_mask: "0x8"
compute_ovs_memory_channels: "2"
dpdk0_driver: igb_uio
diff --git a/labs/ericsson/idf-virtual5.yaml b/labs/ericsson/idf-virtual5.yaml
index 067ec0c0..3d6a366a 100644
--- a/labs/ericsson/idf-virtual5.yaml
+++ b/labs/ericsson/idf-virtual5.yaml
@@ -58,6 +58,7 @@ idf:
private: ~
public: ~
network:
+ interface_mtu: 9000
ntp_strata_host1: 1.se.pool.ntp.org
ntp_strata_host2: 0.se.pool.ntp.org
node:
@@ -87,13 +88,13 @@ idf:
- compute_params: &compute_params
common: &compute_params_common
compute_hugepages_size: 2M
- compute_hugepages_count: 2048
+ compute_hugepages_count: 5120
compute_hugepages_mount: /mnt/hugepages_2M
dpdk:
<<: *compute_params_common
compute_dpdk_driver: uio
compute_ovs_pmd_cpu_mask: "0x6"
- compute_ovs_dpdk_socket_mem: "1024"
+ compute_ovs_dpdk_socket_mem: "3072"
compute_ovs_dpdk_lcore_mask: "0x8"
compute_ovs_memory_channels: "2"
dpdk0_driver: igb_uio
diff --git a/labs/ericsson/virtual-pod1bl01.yaml b/labs/ericsson/virtual-pod1bl01.yaml
index 9edebee4..e565d54e 100644
--- a/labs/ericsson/virtual-pod1bl01.yaml
+++ b/labs/ericsson/virtual-pod1bl01.yaml
@@ -100,7 +100,7 @@ nodes:
vendor: libvirt
model: virt
cpus: 1
- cores: 8
+ cores: 4
memory: 6G
disks: &disks
- name: 'disk1'
@@ -115,22 +115,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
@@ -149,12 +149,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
diff --git a/labs/ericsson/virtual1.yaml b/labs/ericsson/virtual1.yaml
index c19d9c79..57f855bc 100644
--- a/labs/ericsson/virtual1.yaml
+++ b/labs/ericsson/virtual1.yaml
@@ -100,7 +100,7 @@ nodes:
vendor: libvirt
model: virt
cpus: 1
- cores: 8
+ cores: 4
memory: 6G
disks: &disks
- name: 'disk1'
@@ -115,22 +115,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
@@ -149,12 +149,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
diff --git a/labs/ericsson/virtual2.yaml b/labs/ericsson/virtual2.yaml
index 7298b78c..cab58ee4 100644
--- a/labs/ericsson/virtual2.yaml
+++ b/labs/ericsson/virtual2.yaml
@@ -100,7 +100,7 @@ nodes:
vendor: libvirt
model: virt
cpus: 1
- cores: 8
+ cores: 4
memory: 6G
disks: &disks
- name: 'disk1'
@@ -115,22 +115,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
@@ -149,12 +149,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
diff --git a/labs/ericsson/virtual3.yaml b/labs/ericsson/virtual3.yaml
index 33f2e09f..d4011712 100644
--- a/labs/ericsson/virtual3.yaml
+++ b/labs/ericsson/virtual3.yaml
@@ -100,7 +100,7 @@ nodes:
vendor: libvirt
model: virt
cpus: 1
- cores: 8
+ cores: 4
memory: 6G
disks: &disks
- name: 'disk1'
@@ -115,22 +115,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
@@ -149,12 +149,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
diff --git a/labs/ericsson/virtual4.yaml b/labs/ericsson/virtual4.yaml
index cbf50f08..effa8610 100644
--- a/labs/ericsson/virtual4.yaml
+++ b/labs/ericsson/virtual4.yaml
@@ -100,7 +100,7 @@ nodes:
vendor: libvirt
model: virt
cpus: 1
- cores: 8
+ cores: 4
memory: 6G
disks: &disks
- name: 'disk1'
@@ -115,22 +115,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
@@ -149,12 +149,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
diff --git a/labs/ericsson/virtual5.yaml b/labs/ericsson/virtual5.yaml
index 48260449..b49d6e87 100644
--- a/labs/ericsson/virtual5.yaml
+++ b/labs/ericsson/virtual5.yaml
@@ -92,7 +92,7 @@ nodes:
vendor: libvirt
model: virt
cpus: 1
- cores: 8
+ cores: 4
memory: 6G
disks: &disks
- name: 'disk1'
@@ -107,22 +107,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
@@ -141,13 +141,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
-##############################################################################
diff --git a/labs/intel/idf-pod18.yaml b/labs/intel/idf-pod18.yaml
index 008cfa2d..e219e3b9 100644
--- a/labs/intel/idf-pod18.yaml
+++ b/labs/intel/idf-pod18.yaml
@@ -35,7 +35,7 @@ idf:
mask: 24
private: # floating
interface: 2
- vlan: native
+ vlan: 1000-1030
network: 10.10.182.0
mask: 24
bridge: brExt
diff --git a/labs/itri/idf-pod1.yaml b/labs/itri/idf-pod1.yaml
new file mode 100644
index 00000000..f88a913f
--- /dev/null
+++ b/labs/itri/idf-pod1.yaml
@@ -0,0 +1,92 @@
+##############################################################################
+# Copyright (c) 2019 ITRI.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+### ITRI POD 1 installer descriptor file ###
+
+idf:
+ version: 0.1
+ installer: ['compass4nfv', 'fuel']
+ net_config:
+ # NOTE: Network names are likely to change after the PDF spec is updated
+ admin:
+ interface: 0
+ vlan: native
+ network: 10.1.0.0
+ mask: 24
+ storage:
+ interface: 1
+ vlan: native
+ network: 172.16.2.0
+ mask: 24
+ oob:
+ interface: 1
+ ip-range: 100.86.5.28-100.86.5.33
+ vlan: native
+ public:
+ interface: 2
+ vlan: native
+ network: 100.86.0.0
+ mask: 16
+ gateway: 100.86.0.254
+ dns:
+ - 8.8.8.8
+ - 8.8.4.4
+ mgmt:
+ interface: 4
+ vlan: 1001
+ network: 172.16.3.0
+ mask: 24
+ private:
+ interface: 3
+ vlan: 100
+ network: 172.16.1.0
+ mask: 24
+ fuel:
+ jumphost:
+ bridges:
+ admin: 'pxebr'
+ mgmt: 'br-ctl'
+ private: ''
+ public: ''
+ network:
+ node:
+ # Ordered-list, index should be in sync with node index in PDF
+ - interfaces:
+ # Ordered-list, index should be in sync with interface index in PDF
+ - 'eth0'
+ - 'eth1'
+ - 'eth2'
+ - 'eth3'
+ - 'eth4'
+ busaddr:
+ # Bus-info reported by `ethtool -i ethX`
+ - '0000:03:00.0'
+ - '0000:05:00.3'
+ - '0000:02:00.1'
+ - '0000:05:00.0'
+ - '0000:02:00.0'
+ - interfaces: &interfaces
+ - 'eth0'
+ - 'eth1'
+ - 'eth2'
+ - 'eth3'
+ - 'eth4'
+ busaddr: &busaddr
+ - '0000:03:00.0'
+ - '0000:04:00.1'
+ - '0000:02:00.1'
+ - '0000:05:00.1'
+ - '0000:02:00.0'
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
diff --git a/labs/itri/pod1.yaml b/labs/itri/pod1.yaml
new file mode 100644
index 00000000..06140900
--- /dev/null
+++ b/labs/itri/pod1.yaml
@@ -0,0 +1,295 @@
+##############################################################################
+# Copyright (c) 2018 ITRI, Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+### ITRI POD 1 descriptor file ###
+
+version: 1.0
+details:
+ pod_owner: ITRI
+ contact: mhhsu@itri.org.tw
+ lab: ITRI Pharos Lab
+ location: Taiwan
+ type: production
+ link: https://wiki.opnfv.org/display/pharos/Community+Labs
+##############################################################################
+jumphost:
+ name: pod1-jump
+ node:
+ type: baremetal
+ vendor: Dell
+ model: PowerEdge R730
+ arch: x86_64
+ cpus: 2
+ cpu_cflags: Broadwell
+ cores: 24
+ memory: 64G
+ disks: &disks
+ - name: 'disk1'
+ disk_capacity: 480G
+ disk_type: ssd
+ disk_interface: ssd
+ disk_rotation: 0
+ - name: 'disk2'
+ disk_capacity: 480G
+ disk_type: ssd
+ disk_interface: ssd
+ disk_rotation: 0
+ - name: 'disk3'
+ disk_capacity: 480G
+ disk_type: ssd
+ disk_interface: ssd
+ disk_rotation: 0
+ - name: 'disk4'
+ disk_capacity: 480G
+ disk_type: ssd
+ disk_interface: ssd
+ disk_rotation: 0
+ - name: 'disk5'
+ disk_capacity: 1T
+ disk_type: hdd
+ disk_interface: sata
+ disk_rotation: 7200
+ - name: 'disk6'
+ disk_capacity: 1T
+ disk_type: hdd
+ disk_interface: sata
+ disk_rotation: 7200
+ - name: 'disk7'
+ disk_capacity: 1T
+ disk_type: hdd
+ disk_interface: sata
+ disk_rotation: 7200
+ - name: 'disk8'
+ disk_capacity: 1T
+ disk_type: hdd
+ disk_interface: sata
+ disk_rotation: 7200
+ os: ubuntu-16.04
+ remote_params: &remote_params
+ type: ipmi
+ versions:
+ - 2.0
+ user: admin
+ pass: admin
+ remote_management:
+ <<: *remote_params
+ address: 100.86.5.23
+ mac_address: "10:98:36:b5:6f:79"
+ interfaces:
+ - mac_address: "52:54:00:7c:d6:b4"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ address: 10.1.0.1
+ name: 'nic1'
+##############################################################################
+nodes:
+ - name: pod1-node1
+ node: &nodeparams
+ type: baremetal
+ vendor: Dell
+ model: PowerEdge R730
+ arch: x86_64
+ cpus: 2
+ cpu_cflags: Broadwell
+ cores: 24
+ memory: 128G
+ disks: *disks
+ remote_management:
+ <<: *remote_params
+ address: 100.86.5.28
+ mac_address: "18:66:da:a3:f0:99"
+ interfaces:
+ - mac_address: "18:66:da:a3:f0:97"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ address: 10.1.0.50
+ name: 'nic1'
+ - mac_address: "3c:fd:fe:12:29:c6"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 172.16.2.1
+ name: 'nic2'
+ - mac_address: "18:66:da:a3:f0:96"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ address: 100.86.88.10
+ name: 'nic3'
+ - mac_address: "3c:fd:fe:12:29:c0"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 172.16.1.1
+ name: 'nic4'
+ - mac_address: "18:66:da:a3:f0:95"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ name: 'nic5'
+ ############################################################################
+ - name: pod1-node2
+ node: *nodeparams
+ disks: *disks
+ remote_management:
+ <<: *remote_params
+ address: 100.86.5.29
+ mac_address: "18:66:da:a3:f3:c9"
+ interfaces:
+ - mac_address: "18:66:da:a3:f3:c7"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ address: 10.1.0.51
+ name: 'nic1'
+ - mac_address: "3c:fd:fe:1a:e0:02"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 172.16.2.2
+ name: 'nic2'
+ - mac_address: "18:66:da:a3:f3:c6"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ address: 100.86.88.11
+ name: 'nic3'
+ - mac_address: "3c:fd:fe:12:09:e2"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 172.16.1.2
+ name: 'nic4'
+ - mac_address: "18:66:da:a3:f3:c5"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ name: 'nic5'
+ ############################################################################
+ - name: pod1-node3
+ node: *nodeparams
+ disks: *disks
+ remote_management:
+ <<: *remote_params
+ address: 100.86.5.30
+ mac_address: "18:66:da:a3:c2:c6"
+ interfaces:
+ - mac_address: "18:66:da:a3:c2:c4"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ address: 10.1.0.52
+ name: 'nic1'
+ - mac_address: "3c:fd:fe:1b:23:62"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 172.16.2.3
+ name: 'nic2'
+ - mac_address: "18:66:da:a3:c2:c3"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ address: 100.86.88.12
+ name: 'nic3'
+ - mac_address: "3c:fd:fe:12:29:e2"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 172.16.1.3
+ name: 'nic4'
+ - mac_address: "18:66:da:a3:c2:c2"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ name: 'nic5'
+ ############################################################################
+ - name: pod1-node4
+ node: *nodeparams
+ disks: *disks
+ remote_management:
+ <<: *remote_params
+ address: 100.86.5.31
+ mac_address: "18:66:da:a3:bd:dd"
+ interfaces:
+ - mac_address: "18:66:da:a3:bd:db"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ address: 10.1.0.53
+ name: 'nic1'
+ - mac_address: "3c:fd:fe:1a:c6:c2"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 172.16.2.4
+ name: 'nic2'
+ - mac_address: "18:66:da:a3:bd:da"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ address: 100.86.88.13
+ name: 'nic3'
+ - mac_address: "3c:fd:fe:12:2b:22"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 172.16.1.4
+ name: 'nic4'
+ - mac_address: "18:66:da:a3:bd:d9"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ name: 'nic5'
+ ############################################################################
+ - name: pod1-node5
+ node: *nodeparams
+ disks: *disks
+ remote_management:
+ <<: *remote_params
+ address: 100.86.5.32
+ mac_address: "18:66:da:a3:b9:8e"
+ interfaces:
+ - mac_address: "18:66:da:a3:b9:8c"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ address: 10.1.0.54
+ name: 'nic1'
+ - mac_address: "3c:fd:fe:1b:22:e2"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 172.16.2.5
+ name: 'nic2'
+ - mac_address: "18:66:da:a3:b9:8b"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ address: 100.86.88.14
+ name: 'nic3'
+ - mac_address: "3c:fd:fe:12:29:a2"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 172.16.1.5
+ name: 'nic4'
+ - mac_address: "18:66:da:a3:b9:8a"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ name: 'nic5'
+ ############################################################################
+ - name: pod1-node6
+ node: *nodeparams
+ disks: *disks
+ remote_management:
+ <<: *remote_params
+ address: 100.86.5.33
+ mac_address: "18:66:da:a3:c7:5b"
+ interfaces:
+ - mac_address: "18:66:da:a3:c7:59"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ address: 10.1.0.55
+ name: 'nic1'
+ - mac_address: "3c:fd:fe:1b:00:82"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 172.16.2.6
+ name: 'nic2'
+ - mac_address: "18:66:da:a3:c7:58"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ address: 100.86.88.15
+ name: 'nic3'
+ - mac_address: "3c:fd:fe:12:2a:c2"
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 172.16.1.6
+ name: 'nic4'
+ - mac_address: "18:66:da:a3:c7:57"
+ speed: 1gb
+ features: 'dpdk|sriov'
+ name: 'nic5'
diff --git a/labs/unh/idf-virtual1.yaml b/labs/unh/idf-virtual1.yaml
new file mode 100644
index 00000000..0ab8353a
--- /dev/null
+++ b/labs/unh/idf-virtual1.yaml
@@ -0,0 +1,105 @@
+##############################################################################
+# Copyright (c) 2019 Ericsson AB, Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+### unh-virtual1 Installer descriptor file ###
+
+idf:
+ version: 0.1
+ net_config:
+ # NOTE: Network names are likely to change after the PDF spec is updated
+ oob:
+ interface: 0
+ ip-range: ~
+ vlan: native
+ mask: 24
+ # All networks (except OOB) are virtual networks managed by `libvirt`
+ # Interface indexes are based on Fuel installer defaults
+ admin:
+ interface: 0 # when used, will be first vnet interface, untagged
+ vlan: native
+ network: 192.168.11.0
+ mask: 24
+ mgmt:
+ interface: 1 # when used, will be second vnet interface, untagged
+ vlan: native
+ network: 172.16.10.0
+ ip-range: 172.16.10.10-172.16.10.254 # Some IPs are in use by lab infra
+ mask: 24
+ storage:
+ interface: 4 # when used, will be fifth vnet interface, untagged
+ vlan: native
+ network: 192.168.20.0
+ mask: 24
+ private:
+ interface: 2 # when used, will be third vnet interface, untagged
+ vlan: 1000-1999
+ network: 10.1.0.0
+ mask: 24
+ public:
+ interface: 3 # when used, will be fourth vnet interface, untagged
+ vlan: native
+ network: 10.16.0.0
+ ip-range: 10.16.0.100-10.16.0.254 # Some IPs are in use by lab infra
+ mask: 24
+ gateway: 10.16.0.1
+ dns:
+ - 8.8.8.8
+ - 8.8.4.4
+ fuel:
+ jumphost:
+ bridges:
+ admin: ~
+ mgmt: ~
+ private: ~
+ public: ~
+ network:
+ interface_mtu: 9000
+ ntp_strata_host1: 1.pool.ntp.org
+ ntp_strata_host2: 0.pool.ntp.org
+ node:
+ # Ordered-list, index should be in sync with node index in PDF
+ - interfaces: &interfaces
+ # Ordered-list, index should be in sync with interface index in PDF
+ - 'ens3'
+ - 'ens4'
+ - 'ens5'
+ - 'ens6'
+ busaddr: &busaddr
+ # Bus-info reported by `ethtool -i ethX`
+ - '0000:00:03.0'
+ - '0000:00:04.0'
+ - '0000:00:05.0'
+ - '0000:00:06.0'
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ - interfaces: *interfaces
+ busaddr: *busaddr
+ reclass:
+ node:
+ - compute_params: &compute_params
+ common: &compute_params_common
+ compute_hugepages_size: 2M
+ compute_hugepages_count: 5120
+ compute_hugepages_mount: /mnt/hugepages_2M
+ dpdk:
+ <<: *compute_params_common
+ compute_dpdk_driver: uio
+ compute_ovs_pmd_cpu_mask: "0x6"
+ compute_ovs_dpdk_socket_mem: "3072"
+ compute_ovs_dpdk_lcore_mask: "0x8"
+ compute_ovs_memory_channels: "2"
+ dpdk0_driver: igb_uio
+ dpdk0_n_rxq: 2
+ - compute_params: *compute_params
+ - compute_params: *compute_params
+ - compute_params: *compute_params
+ - compute_params: *compute_params
diff --git a/labs/unh/virtual1.yaml b/labs/unh/virtual1.yaml
new file mode 100644
index 00000000..8dc2edda
--- /dev/null
+++ b/labs/unh/virtual1.yaml
@@ -0,0 +1,164 @@
+##############################################################################
+# Copyright (c) 2019 Ericsson AB, Mirantis Inc., Enea AB and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+### unh-virtual1 POD descriptor file ###
+
+version: 1.0
+details:
+ pod_owner: University of New Hampshire
+ contact: lincoln.lavoie@iol.unh.edu
+ lab: UNH lab
+ location: New Hampshire, USA
+ type: development
+ link: https://wiki.opnfv.org/display/INF/Lab+as+a+Service+2.0
+##############################################################################
+jumphost:
+ name: unh-virtual1
+ node: &jumpparams
+ type: baremetal
+ vendor: HP
+ model: ProLiant
+ arch: x86_64
+ cpus: 2
+ cpu_cflags: haswell
+ cores: 22
+ memory: 512G
+ disks:
+ - name: 'disk1'
+ disk_capacity: 800G
+ disk_type: ssd
+ disk_interface: sata
+ disk_rotation: 0
+ os: ubuntu-16.04
+ remote_params: &remoteparas
+ type: ipmi
+ versions:
+ - 1.0
+ - 2.0
+ user: changeme
+ pass: changeme
+ remote_management:
+ <<: *remoteparas
+ address: 0.0.0.0/24
+ mac_address: "00:00:00:00:00:00"
+ interfaces:
+ - name: 'nic1'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ address: 100.64.202.5/24
+ mac_address: "00:00:00:00:00:00"
+ - name: 'nic2'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ mac_address: "00:00:00:00:00:00"
+ - name: 'nic3'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ mac_address: "00:00:00:00:00:00"
+ - name: 'nic4'
+ speed: 10gb
+ features: 'dpdk|sriov'
+ mac_address: "00:00:00:00:00:00"
+##############################################################################
+nodes:
+ - name: node-1
+ node: &nodeparams
+ <<: *jumpparams
+ # Fuel overrides certain params (e.g. cpus, mem) based on node role later
+ type: virtual
+ vendor: libvirt
+ model: virt
+ cpus: 1
+ cores: 4
+ memory: 14G
+ disks:
+ - name: 'disk1'
+ disk_capacity: 400G
+ disk_type: hdd
+ disk_interface: scsi # virtio-scsi
+ disk_rotation: &diskrotation 0
+ remote_management: &remotemgmt
+ type: libvirt
+ user: changeme
+ pass: changeme
+ address: 'qemu:///system'
+ interfaces: &interfaces
+ - name: 'nic1'
+ speed: 1gb
+ features: 'dpdk|sriov'
+ mac_address: "00:00:00:00:00:00" # MACs will be assigned by libvirt
+ vlan: native
+ - name: 'nic2'
+ speed: 1gb
+ features: 'dpdk|sriov'
+ mac_address: "00:00:00:00:00:00"
+ vlan: native
+ - name: 'nic3'
+ speed: 1gb
+ features: 'dpdk|sriov'
+ mac_address: "00:00:00:00:00:00"
+ vlan: native
+ - name: 'nic4'
+ speed: 1gb
+ features: 'dpdk|sriov'
+ mac_address: "00:00:00:00:00:00"
+ vlan: native
+ ############################################################################
+ - name: node-2
+ node:
+ <<: *nodeparams
+ # Fuel overrides certain params (e.g. cpus, mem) based on node role later
+ cpus: 1
+ cores: 4
+ memory: 8G
+ disks: &disks
+ - name: 'disk1'
+ disk_capacity: 100G
+ disk_type: hdd
+ disk_interface: scsi # virtio-scsi
+ disk_rotation: *diskrotation
+ remote_management: *remotemgmt
+ interfaces: *interfaces
+ ############################################################################
+ - name: node-3
+ node:
+ <<: *nodeparams
+ # Fuel overrides certain params (e.g. cpus, mem) based on node role later
+ cpus: 1
+ cores: 4
+ memory: 8G
+ disks: *disks
+ remote_management: *remotemgmt
+ interfaces: *interfaces
+ ############################################################################
+ - name: node-4
+ node: &compute_nodeparams
+ <<: *nodeparams
+ # Fuel overrides certain params (e.g. cpus, mem) based on node role later
+ cpus: 2
+ cores: 18
+ memory: 120G
+ disks: &compute_disks
+ - name: 'disk1'
+ disk_capacity: 100G
+ disk_type: hdd
+ disk_interface: scsi # virtio-scsi
+ disk_rotation: *diskrotation
+ - name: 'disk2'
+ disk_capacity: 100G
+ disk_type: hdd
+ disk_interface: scsi # virtio-scsi
+ disk_rotation: *diskrotation
+ remote_management: *remotemgmt
+ interfaces: *interfaces
+ ############################################################################
+ - name: node-5
+ node: *compute_nodeparams
+ disks: *compute_disks
+ remote_management: *remotemgmt
+ interfaces: *interfaces