1. devstack
  2. Commit bf81732b129675d667d2285859f32db16ef5e2f5
Browse code

Merge "Set unprovision and active timeout to match build_timeout"

Jenkins authored on 2015/11/29 19:27:11
Showing 1 changed files
lib/tempest
History View file @ bf81732
... ... 
@@ -508,7 +508,8 @@ function configure_tempest {
508 508 
     # Baremetal
509 509 
     if [ "$VIRT_DRIVER" = "ironic" ] ; then
510 510 
         iniset $TEMPEST_CONFIG baremetal driver_enabled True
511 
-        iniset $TEMPEST_CONFIG baremetal unprovision_timeout 300
511 
+        iniset $TEMPEST_CONFIG baremetal unprovision_timeout $BUILD_TIMEOUT
512 
+        iniset $TEMPEST_CONFIG baremetal active_timeout $BUILD_TIMEOUT
512 513 
         iniset $TEMPEST_CONFIG baremetal deploy_img_dir $FILES
513 514 
         iniset $TEMPEST_CONFIG baremetal node_uuid $IRONIC_NODE_UUID
514 515 
         iniset $TEMPEST_CONFIG compute-feature-enabled change_password False