1. devstack
  2. Commit 00b5f4af92a640a2507046cf76ee57caa166310b
Browse code

Replace deprecated baremetal timeouts with new deploy_timeout

See review 258670 for more information. The preceeding patch
consolidates Ironic timeouts into one blanket timeout. This
patch sets the new timeout via the BUILD_TIMEOUT variable and
removes the deprecated timeouts.

Change-Id: I320461b2b40aa2b68afc38a901a5933e39aac1b6
Related-Bug: #1526863

Mike Turek authored on 2015/12/16 03:16:35
Showing 1 changed files
lib/tempest
History View file @ 00b5f4a
... ... 
@@ -533,8 +533,7 @@ function configure_tempest {
533 533 
     # Baremetal
534 534 
     if [ "$VIRT_DRIVER" = "ironic" ] ; then
535 535 
         iniset $TEMPEST_CONFIG baremetal driver_enabled True
536 
-        iniset $TEMPEST_CONFIG baremetal unprovision_timeout $BUILD_TIMEOUT
537 
-        iniset $TEMPEST_CONFIG baremetal active_timeout $BUILD_TIMEOUT
536 
+        iniset $TEMPEST_CONFIG baremetal deploy_timeout $BUILD_TIMEOUT
538 537 
         iniset $TEMPEST_CONFIG baremetal deploy_img_dir $FILES
539 538 
         iniset $TEMPEST_CONFIG baremetal node_uuid $IRONIC_NODE_UUID
540 539 
         iniset $TEMPEST_CONFIG compute-feature-enabled change_password False