aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/conf/cluster.conf
diff options
context:
space:
mode:
authorbaigk <baiguoku@huawei.com>2015-09-08 07:47:19 -0400
committerbaigk <baiguoku@huawei.com>2015-09-08 08:24:09 -0400
commitcf87d3067a63cb8be315a3addfd9c27d86be3b5a (patch)
tree861d46aebc75c73cc13a19fecfb5c48aa88a56a1 /deploy/conf/cluster.conf
parent633175ed2c5d0ab339027ba0a542bcdd4d3769c0 (diff)
Build improvement for speedup and using public repo
JIRA: COMPASS-19 Change-Id: Iba101807e1bd2f843f1253791b7e87e1acb7934b Signed-off-by: baigk <baiguoku@huawei.com>
Diffstat (limited to 'deploy/conf/cluster.conf')
-rw-r--r--deploy/conf/cluster.conf17
1 files changed, 2 insertions, 15 deletions
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index ef1f5701..72602ea0 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -1,20 +1,7 @@
-export VIRT_NUMBER=5
-export VIRT_CPUS=4
-export VIRT_MEM=16384
-export VIRT_DISK=30G
-export 'ADAPTER_OS_PATTERN=(?i)ubuntu-14\.04.*'
-#export 'ADAPTER_OS_PATTERN=(?i)centos-7\.1.*'
+export ADAPTER_OS_PATTERN='(?i)ubuntu-14\.04\.3.*'
+#export ADAPTER_OS_PATTERN='(?i)centos-7\.1.*'
export ADAPTER_NAME="openstack_juno"
export ADAPTER_TARGET_SYSTEM_PATTERN="^openstack$"
export ADAPTER_FLAVOR_PATTERN="HA-ansible-multinodes"
-export HOSTNAMES="host1,host2,host3,host4,host5"
-export HOST_ROLES="host1=controller,ha;host2=controller,ha;host3=controller,ha;host4=compute;host5=compute"
export DEFAULT_ROLES=""
-export SWITCH_IPS="1.1.1.1"
-export SWITCH_CREDENTIAL="version=2c,community=public"
-export DEPLOYMENT_TIMEOUT="60"
-export POLL_SWITCHES_FLAG="nopoll_switches"
-export DASHBOARD_URL=""
-export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
-source ${REGTEST_DIR}/base.conf
export VIP="10.1.0.222"