From 9e5b19768d6eb9b32564240065ecba6c791cac12 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 28 Feb 2019 15:46:19 +0100 Subject: [virtual] Parameterize scenarios based on PDF/IDF NOTE: only os-nosdn-nofeature-noha is parameterized for now. - move config drive & disk creation from prepare_vms to create_vms; - make default disk size(s) configurable based on scenario defaults and vPDF; * compute nodes require 2 disks to be defined in vPDF, since the pillar reclass model assumes /dev/vdb is reserved for cinder; * if multiple disks are defined in vPDF, they are created and attached accordinly (only ctl01 and cmp nodes are parameterized in this change; only for the os-nosdn-nofeature-noha scenario); - vCPU specifications are deduced based on vPDF (sockets, cores); * threads/core is hard set to 2 since vPDF does not have a key for it; * NUMA resources are distributed evenly based on the number of sockets configured in PDF; * no less than the mininum requirement for a scenario is allocated (e.g. if PDF specifies 2 cores, but the scenario requires at least 4 cores, the larger value will be used); - RAM is deduced based on PDF (but no less than the mininum req is allocated, e.g. if PDF specifies 2GB RAM for computes, but the scenario requires at least 8GB, the larger value will be used); Change-Id: I97188aa2a1006865b8429eb6483e10c76795f7d2 Signed-off-by: Alexandru Avadanii --- mcp/config/scenario/os-nosdn-fdio-noha.yaml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'mcp/config/scenario/os-nosdn-fdio-noha.yaml') diff --git a/mcp/config/scenario/os-nosdn-fdio-noha.yaml b/mcp/config/scenario/os-nosdn-fdio-noha.yaml index 747adbee2..187b5bf48 100644 --- a/mcp/config/scenario/os-nosdn-fdio-noha.yaml +++ b/mcp/config/scenario/os-nosdn-fdio-noha.yaml @@ -35,6 +35,7 @@ virtual: memory: 8388608 cpus: 0-7 cmp001: + disks: 100G;100G vcpus: 8 ram: 8192 cpu_topology: @@ -46,6 +47,7 @@ virtual: memory: 8388608 cpus: 0-7 cmp002: + disks: 100G;100G vcpus: 8 ram: 8192 cpu_topology: -- cgit 1.2.3-korg