diff options
| author |   Dan Radez <dradez@redhat.com> | 2015-09-04 14:38:56 -0400 |
|---|---|---|
| committer | Dan Radez <dradez@redhat.com> | 2015-09-04 14:43:31 -0400 |
| commit | 8f49d7a5efc0e847ecffcb05f6aff2186d8cecc9 (patch) | |
| tree | 0970daa3d2c30f93fe6aa40cfbfb63549e5182d6 /compass/deploy/conf/five.conf | |
| parent | ab4950db472c20b57bff533f1f330b5b794aa35b (diff) | |
| parent | 591a1c4327c0793b4a15443f9e72b79ffbeaa226 (diff) | |
Merge branch 'master' into merge-master-arno
Change-Id: Idbe1d8ba5f1fe44ae5c5e407d5999c28909639c5
Signed-off-by: Dan Radez <dradez@redhat.com>
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 ) |