commit b695d361ff10e32f121611407e9f0da24985dc0e
author Jenkins <jenkins@review.openstack.org> Sat Jan 16 13:40:58 2016 +0000
committer Gerrit Code Review <review@openstack.org> Sat Jan 16 13:40:58 2016 +0000
tree 803e5f0e313c6a505e4350097ad07e370ea2b103
parent 3106c2d7d4229b99f2844718ddc5fd768caf067f
parent d091a2dd5467f42491e85208b236956b78c1c837

Merge "Revert "Replace deprecated baremetal timeouts with new deploy_timeout""

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index 8431229..dc1e450 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -501,7 +501,8 @@
     # Baremetal
     if [ "$VIRT_DRIVER" = "ironic" ] ; then
         iniset $TEMPEST_CONFIG baremetal driver_enabled True
-        iniset $TEMPEST_CONFIG baremetal deploy_timeout $BUILD_TIMEOUT
+        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