summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2017-07-26 12:01:33 +0100
committerMarkos Chandras <mchandras@suse.de>2017-08-17 11:03:39 +0100
commit6ccf0cee70808e7aa8ff9a7226d97d4fe1c1259f (patch)
tree6ede0792e44c89b0f5395dcc47fbaf104ae0b501
parentc7ceaa77fba0d3dbe0ca802d0b4c159f38b6cbf9 (diff)
prototypes: xci: config: Allow users to set VM specs
The default VM spec may not be good enough for every host so allow users to override the default VM_* variables. Change-Id: Ie846620ab81b7fedcbe4b23da735379ab75d3cc2 Signed-off-by: Markos Chandras <mchandras@suse.de>
-rwxr-xr-xxci/config/aio-vars8
-rwxr-xr-xxci/config/ha-vars8
-rwxr-xr-xxci/config/mini-vars8
-rwxr-xr-xxci/config/noha-vars8
4 files changed, 16 insertions, 16 deletions
diff --git a/xci/config/aio-vars b/xci/config/aio-vars
index f28ecff1..ed921f42 100755
--- a/xci/config/aio-vars
+++ b/xci/config/aio-vars
@@ -11,8 +11,8 @@
#-------------------------------------------------------------------------------
export TEST_VM_NUM_NODES=1
export TEST_VM_NODE_NAMES=opnfv
-export VM_DOMAIN_TYPE=kvm
-export VM_CPU=8
-export VM_DISK=80
-export VM_MEMORY_SIZE=8192
+export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm}
+export VM_CPU=${VM_CPU:-8}
+export VM_DISK=${VM_DISK:-80}
+export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-8192}
export VM_DISK_CACHE=unsafe
diff --git a/xci/config/ha-vars b/xci/config/ha-vars
index 1ba45890..b864c42e 100755
--- a/xci/config/ha-vars
+++ b/xci/config/ha-vars
@@ -11,8 +11,8 @@
#-------------------------------------------------------------------------------
export TEST_VM_NUM_NODES=6
export TEST_VM_NODE_NAMES="opnfv controller00 controller01 controller02 compute00 compute01"
-export VM_DOMAIN_TYPE=kvm
-export VM_CPU=8
-export VM_DISK=80
-export VM_MEMORY_SIZE=16384
+export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm}
+export VM_CPU=${VM_CPU:-8}
+export VM_DISK=${VM_CPU:-80}
+export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-16384}
export VM_DISK_CACHE=unsafe
diff --git a/xci/config/mini-vars b/xci/config/mini-vars
index 8f1e83cd..fd32e7f3 100755
--- a/xci/config/mini-vars
+++ b/xci/config/mini-vars
@@ -11,8 +11,8 @@
#-------------------------------------------------------------------------------
export TEST_VM_NUM_NODES=3
export TEST_VM_NODE_NAMES="opnfv controller00 compute00"
-export VM_DOMAIN_TYPE=kvm
-export VM_CPU=8
-export VM_DISK=80
-export VM_MEMORY_SIZE=12288
+export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm}
+export VM_CPU=${VM_CPU:-8}
+export VM_DISK=${VM_DISK:-80}
+export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-12288}
export VM_DISK_CACHE=unsafe
diff --git a/xci/config/noha-vars b/xci/config/noha-vars
index 935becb2..6d85111c 100755
--- a/xci/config/noha-vars
+++ b/xci/config/noha-vars
@@ -11,8 +11,8 @@
#-------------------------------------------------------------------------------
export TEST_VM_NUM_NODES=4
export TEST_VM_NODE_NAMES="opnfv controller00 compute00 compute01"
-export VM_DOMAIN_TYPE=kvm
-export VM_CPU=8
-export VM_DISK=80
-export VM_MEMORY_SIZE=12288
+export VM_DOMAIN_TYPE=${VM_DOMAIN_TYPE:-kvm}
+export VM_CPU=${VM_CPU:-8}
+export VM_DISK=${VM_DISK:-80}
+export VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-12288}
export VM_DISK_CACHE=unsafe