summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFatih Degirmenci <fatih.degirmenci@ericsson.com>2016-11-23 11:08:20 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-23 11:08:20 +0000
commit0eec8a270dc3c416d6c93e14708c9cb5c3b53dce (patch)
tree9ad8e52c12cddf87b68d956b05ed350b8f141730
parent0b9074ae2116eea2b1b88a14208fbf5742d7ef80 (diff)
parentf2e09a1c47a8333efb7309089017f677db197f6e (diff)
Merge "bifrost: test-bifrost-deployment: Allow overriding VM hardware options"
-rwxr-xr-xprototypes/bifrost/scripts/test-bifrost-deployment.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/prototypes/bifrost/scripts/test-bifrost-deployment.sh b/prototypes/bifrost/scripts/test-bifrost-deployment.sh
index 030faedcf..32a066388 100755
--- a/prototypes/bifrost/scripts/test-bifrost-deployment.sh
+++ b/prototypes/bifrost/scripts/test-bifrost-deployment.sh
@@ -34,13 +34,13 @@ PROVISION_WAIT_TIMEOUT=${PROVISION_WAIT_TIMEOUT:-2400}
TEST_VM_NUM_NODES=3
export TEST_VM_NODE_NAMES="jumphost.opnfvlocal controller00.opnfvlocal compute00.opnfvlocal"
export VM_DOMAIN_TYPE="kvm"
-export VM_CPU=4
-export VM_DISK=100
+export VM_CPU=${VM_CPU:-4}
+export VM_DISK=${VM_DISK:-100}
TEST_PLAYBOOK="test-bifrost-infracloud.yaml"
USE_INSPECTOR=true
USE_CIRROS=false
TESTING_USER=root
-VM_MEMORY_SIZE="8192"
+VM_MEMORY_SIZE=${VM_MEMORY_SIZE:-8192}
DOWNLOAD_IPA=true
CREATE_IPA_IMAGE=false
INSPECT_NODES=true