1. devstack
  2. Commit b695d361ff10e32f121611407e9f0da24985dc0e
Browse code

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

Jenkins authored on 2016/01/16 22:40:58
Showing 1 changed files
lib/tempest
History View file @ b695d36
... ... 
@@ -501,7 +501,8 @@ function configure_tempest {
501 501 
     # Baremetal
502 502 
     if [ "$VIRT_DRIVER" = "ironic" ] ; then
503 503 
         iniset $TEMPEST_CONFIG baremetal driver_enabled True
504 
-        iniset $TEMPEST_CONFIG baremetal deploy_timeout $BUILD_TIMEOUT
504 
+        iniset $TEMPEST_CONFIG baremetal unprovision_timeout $BUILD_TIMEOUT
505 
+        iniset $TEMPEST_CONFIG baremetal active_timeout $BUILD_TIMEOUT
505 506 
         iniset $TEMPEST_CONFIG baremetal deploy_img_dir $FILES
506 507 
         iniset $TEMPEST_CONFIG baremetal node_uuid $IRONIC_NODE_UUID
507 508 
         iniset $TEMPEST_CONFIG compute-feature-enabled change_password False