1. devstack
  2. Commit d091a2dd5467f42491e85208b236956b78c1c837
Browse code

Revert "Replace deprecated baremetal timeouts with new deploy_timeout"

This reverts commit 00b5f4af92a640a2507046cf76ee57caa166310b.

This patch was merged before the timeout was merged to
tempest. This means that devstack is currently referencing
a non-existent config option. As such I think it needs to be reverted.

Change-Id: I947261dc330ef35efce1ecd805ba6e649e81a6aa

Michael Turek authored on 2016/01/12 03:17:50
Showing 1 changed files
lib/tempest
History View file @ d091a2d
... ... 
@@ -533,7 +533,8 @@ 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 deploy_timeout $BUILD_TIMEOUT
536 
+        iniset $TEMPEST_CONFIG baremetal unprovision_timeout $BUILD_TIMEOUT
537 
+        iniset $TEMPEST_CONFIG baremetal active_timeout $BUILD_TIMEOUT
537 538 
         iniset $TEMPEST_CONFIG baremetal deploy_img_dir $FILES
538 539 
         iniset $TEMPEST_CONFIG baremetal node_uuid $IRONIC_NODE_UUID
539 540 
         iniset $TEMPEST_CONFIG compute-feature-enabled change_password False