diff options
| author |   Markos Chandras <mchandras@suse.de> | 2017-08-17 10:24:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-17 10:24:14 +0000 |
| commit | ac069fdf0157e96895bf8a75c689a822d5a80e4f (patch) | |
| tree | bddd3391e3c519c62b066511e827cdcab34e3b6f /xci | |
| parent | 98f0c778b59c6092a07370ffafaddfe4fb641fea (diff) | |
| parent | 6ccf0cee70808e7aa8ff9a7226d97d4fe1c1259f (diff) | |
Merge "prototypes: xci: config: Allow users to set VM specs"
Diffstat (limited to 'xci')
| -rwxr-xr-x | xci/config/aio-vars | 8 | ||||
| -rwxr-xr-x | xci/config/ha-vars | 8 | ||||
| -rwxr-xr-x | xci/config/mini-vars | 8 | ||||
| -rwxr-xr-x | xci/config/noha-vars | 8 |
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 |