diff options
Diffstat (limited to 'labs/ericsson')
-rw-r--r-- | labs/ericsson/idf-virtual-pod1bl01.yaml | 5 | ||||
-rw-r--r-- | labs/ericsson/idf-virtual1.yaml | 5 | ||||
-rw-r--r-- | labs/ericsson/idf-virtual2.yaml | 5 | ||||
-rw-r--r-- | labs/ericsson/idf-virtual3.yaml | 5 | ||||
-rw-r--r-- | labs/ericsson/idf-virtual4.yaml | 5 | ||||
-rw-r--r-- | labs/ericsson/idf-virtual5.yaml | 5 | ||||
-rw-r--r-- | labs/ericsson/virtual-pod1bl01.yaml | 24 | ||||
-rw-r--r-- | labs/ericsson/virtual1.yaml | 24 | ||||
-rw-r--r-- | labs/ericsson/virtual2.yaml | 24 | ||||
-rw-r--r-- | labs/ericsson/virtual3.yaml | 24 | ||||
-rw-r--r-- | labs/ericsson/virtual4.yaml | 24 | ||||
-rw-r--r-- | labs/ericsson/virtual5.yaml | 25 |
12 files changed, 120 insertions, 55 deletions
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 -############################################################################## |