From dbe4d06ab1845a9c4a1465c4163cd80bfcdc787a Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Sat, 2 Mar 2019 12:24:38 +0100 Subject: [PDF/IDF] UNH virtual1 for LaaS/ONAP usage In order to fully utilize all available resources (88 CPU threads, 256GB RAM) in Fuel virtual deployments, add basic PDF/IDF files based on ericsson-virtual1 templates. IDF is mostly unchanged compared to idf-virtual1 from Ericsson lab. PDF allocates more disk capacity for the first node (controller role in Fuel deployments), as well as more vCPUs/RAM for the last 2 nodes (compute role in Fuel virtual deployments). While at it, align ericsson vPOD definitions to match the new format (2 disks should be defined for each compute node; account for HT). Change-Id: Iac8ee857a3297084ea9f087ba8007950413fda25 Signed-off-by: Alexandru Avadanii --- labs/ericsson/virtual-pod1bl01.yaml | 16 +++++++++++++--- labs/ericsson/virtual1.yaml | 16 +++++++++++++--- labs/ericsson/virtual2.yaml | 16 +++++++++++++--- labs/ericsson/virtual3.yaml | 16 +++++++++++++--- labs/ericsson/virtual4.yaml | 16 +++++++++++++--- labs/ericsson/virtual5.yaml | 17 +++++++++++++---- 6 files changed, 78 insertions(+), 19 deletions(-) (limited to 'labs/ericsson') diff --git a/labs/ericsson/virtual-pod1bl01.yaml b/labs/ericsson/virtual-pod1bl01.yaml index 996a3309..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' @@ -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 c7519bf1..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' @@ -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 ca3f42eb..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' @@ -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 5c4f6ba7..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' @@ -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 de6c5ee5..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' @@ -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 0a9e602f..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' @@ -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 -############################################################################## -- cgit 1.2.3-korg