commit 7d5c93f561682db6303a0f89930c3d6fd6d0f5fe
author Jenkins <jenkins@review.openstack.org> Tue Apr 15 21:31:37 2014 +0000
committer Gerrit Code Review <review@openstack.org> Tue Apr 15 21:31:37 2014 +0000
tree 2ffe65cba29d955cb65560653b2ea2aa4fc4b78c
parent 4ec302061f03aa847dc67126f52f7f30e91af1c4
parent a2dfd49a3ed6c893c2bc29771c3751adc31a92c3

Merge "Up the default timeout for stack builds"

etc/tempest.conf.sample

diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index a184c76..70c791b 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -752,7 +752,7 @@
 
 # Timeout in seconds to wait for a stack to build. (integer
 # value)
-#build_timeout=600
+#build_timeout=1200
 
 # Instance type for tests. Needs to be big enough for a full
 # OS plus the test workload (string value)

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index c0ab323..b9fe572 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -559,7 +559,7 @@
                default=1,
                help="Time in seconds between build status checks."),
     cfg.IntOpt('build_timeout',
-               default=600,
+               default=1200,
                help="Timeout in seconds to wait for a stack to build."),
     cfg.StrOpt('instance_type',
                default='m1.micro',