commit bca63695b72617eeb6c912f567d78cffc58aa5fe
author Jenkins <jenkins@review.openstack.org> Fri Mar 07 04:58:05 2014 +0000
committer Gerrit Code Review <review@openstack.org> Fri Mar 07 04:58:05 2014 +0000
tree 8e18421161020167d96f3cc5c3bceb873b308251
parent 7691f2593602f950563430182e7e58cd46642896
parent 27f02430864443c127dbf4a09a62497c60fd0aa4

Merge "Raise orchestration build_timeout to 600 seconds"

etc/tempest.conf.sample

diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index ce867e6..31aff61 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -693,7 +693,7 @@
 
 # Timeout in seconds to wait for a stack to build. (integer
 # value)
-#build_timeout=300
+#build_timeout=600
 
 # 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 dd5cc58..a82d6d2 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -533,7 +533,7 @@
                default=1,
                help="Time in seconds between build status checks."),
     cfg.IntOpt('build_timeout',
-               default=300,
+               default=600,
                help="Timeout in seconds to wait for a stack to build."),
     cfg.StrOpt('instance_type',
                default='m1.micro',