diff options
author | Tim Rozet <trozet@redhat.com> | 2015-09-08 14:57:39 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@172.30.200.206> | 2015-09-08 14:57:39 +0000 |
commit | e65ed372ee84b1f634ec24002fb7bfd7d48fd7e7 (patch) | |
tree | b56c3f4dae40c8efab7ddf177c7ae9475d7cf16e /compass/deploy/conf/five.conf | |
parent | 7f8c963b4dbcc1e57e97e2637ad5a639594319fa (diff) | |
parent | 8f49d7a5efc0e847ecffcb05f6aff2186d8cecc9 (diff) |
Merge "Merge branch 'master' into merge-master-arno" into stable/arno
Diffstat (limited to 'compass/deploy/conf/five.conf')
-rw-r--r-- | compass/deploy/conf/five.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compass/deploy/conf/five.conf b/compass/deploy/conf/five.conf index e63e514..f32411b 100644 --- a/compass/deploy/conf/five.conf +++ b/compass/deploy/conf/five.conf @@ -1,6 +1,6 @@ export VIRT_NUMBER=5 export VIRT_CPUS=4 -export VIRT_MEM=4096 +export VIRT_MEM=16384 export VIRT_DISK=30G export 'ADAPTER_OS_PATTERN=(?i)ubuntu-14\.04.*' #export 'ADAPTER_OS_PATTERN=(?i)centos-6\.5.*' @@ -12,7 +12,7 @@ export HOST_ROLES="host1=controller,network;host2=compute,storage;host3=compute, export DEFAULT_ROLES="" export SWITCH_IPS="1.1.1.1" export SWITCH_CREDENTIAL="version=2c,community=public" -export DEPLOYMENT_TIMEOUT="90" +export DEPLOYMENT_TIMEOUT="150" export POLL_SWITCHES_FLAG="nopoll_switches" export DASHBOARD_URL="" export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) |