From 00b5f4af92a640a2507046cf76ee57caa166310b Mon Sep 17 00:00:00 2001 From: Mike Turek Date: Tue, 15 Dec 2015 18:16:35 +0000 Subject: [PATCH] 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 --- lib/tempest | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/tempest b/lib/tempest index 61351c0628..b9d9e80fc2 100644 --- a/lib/tempest +++ b/lib/tempest @@ -533,8 +533,7 @@ function configure_tempest { # Baremetal if [ "$VIRT_DRIVER" = "ironic" ] ; then iniset $TEMPEST_CONFIG baremetal driver_enabled True - iniset $TEMPEST_CONFIG baremetal unprovision_timeout $BUILD_TIMEOUT - iniset $TEMPEST_CONFIG baremetal active_timeout $BUILD_TIMEOUT + iniset $TEMPEST_CONFIG baremetal deploy_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