summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2015-08-22 02:17:37 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2015-08-22 02:17:37 +0000
commitf51b76b181bf2c6e396fecbe8088ef23e8109389 (patch)
tree0c33154b4b700a7d954721f43554fd660dcdc07c
parent8df99c5890236b6acc7578f663f36fd0deafa453 (diff)
parentd0a8dd6cff8413dead723071ae549c68ae01198e (diff)
Merge "Modify the compass deployment time-out Period"
-rw-r--r--deploy/conf/baremetal.conf2
-rw-r--r--deploy/conf/cluster.conf2
-rw-r--r--deploy/conf/five.conf2
3 files changed, 3 insertions, 3 deletions
diff --git a/deploy/conf/baremetal.conf b/deploy/conf/baremetal.conf
index bcf743eb..a97f2b99 100644
--- a/deploy/conf/baremetal.conf
+++ b/deploy/conf/baremetal.conf
@@ -12,7 +12,7 @@ export HOST_ROLES="host1=controller,ha;host2=controller,ha;host3=controller,ha;h
export DEFAULT_ROLES=""
export SWITCH_IPS="192.168.124.2"
export SWITCH_CREDENTIAL="version=2c,community=public"
-export DEPLOYMENT_TIMEOUT="150"
+export DEPLOYMENT_TIMEOUT="90"
export POLL_SWITCHES_FLAG="nopoll_switches"
export DASHBOARD_URL=""
export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
diff --git a/deploy/conf/cluster.conf b/deploy/conf/cluster.conf
index ad797f9b..ef1f5701 100644
--- a/deploy/conf/cluster.conf
+++ b/deploy/conf/cluster.conf
@@ -12,7 +12,7 @@ export HOST_ROLES="host1=controller,ha;host2=controller,ha;host3=controller,ha;h
export DEFAULT_ROLES=""
export SWITCH_IPS="1.1.1.1"
export SWITCH_CREDENTIAL="version=2c,community=public"
-export DEPLOYMENT_TIMEOUT="150"
+export DEPLOYMENT_TIMEOUT="60"
export POLL_SWITCHES_FLAG="nopoll_switches"
export DASHBOARD_URL=""
export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
diff --git a/deploy/conf/five.conf b/deploy/conf/five.conf
index dec9eb7d..a40d68e9 100644
--- a/deploy/conf/five.conf
+++ b/deploy/conf/five.conf
@@ -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="150"
+export DEPLOYMENT_TIMEOUT="60"
export POLL_SWITCHES_FLAG="nopoll_switches"
export DASHBOARD_URL=""
export REGTEST_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )