commit bf81732b129675d667d2285859f32db16ef5e2f5
author Jenkins <jenkins@review.openstack.org> Sun Nov 29 10:27:11 2015 +0000
committer Gerrit Code Review <review@openstack.org> Sun Nov 29 10:27:11 2015 +0000
tree cb7b4b826b6d8af8d4b0a4030daccc547ea6664c
parent f95c9a960322df3cce1f4d98430f86a9654fc632
parent ad69e69e3f278bd28319224035997e11477617c4

Merge "Set unprovision and active timeout to match build_timeout"

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index 85e0e7f..f41ec81 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -508,7 +508,8 @@
     # Baremetal
     if [ "$VIRT_DRIVER" = "ironic" ] ; then
         iniset $TEMPEST_CONFIG baremetal driver_enabled True
-        iniset $TEMPEST_CONFIG baremetal unprovision_timeout 300
+        iniset $TEMPEST_CONFIG baremetal unprovision_timeout $BUILD_TIMEOUT
+        iniset $TEMPEST_CONFIG baremetal active_timeout $BUILD_TIMEOUT
         iniset $TEMPEST_CONFIG baremetal deploy_img_dir $FILES
         iniset $TEMPEST_CONFIG baremetal node_uuid $IRONIC_NODE_UUID
         iniset $TEMPEST_CONFIG compute-feature-enabled change_password False