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
diff --git a/lib/tempest b/lib/tempest
index b9d9e80..61351c0 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -533,7 +533,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