openstack/devstack
Code Issues Proposed changes

Merge "Revert "Replace deprecated baremetal timeouts with new deploy_timeout""

Browse Source
This commit is contained in:
Jenkins 2016-01-16 13:40:58 +00:00 committed by Gerrit Code Review
commit b695d361ff
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/tempest
View File

@ -501,7 +501,8 @@ function configure_tempest {
# Baremetal # Baremetal
if [ "$VIRT_DRIVER" = "ironic" ] ; then if [ "$VIRT_DRIVER" = "ironic" ] ; then
iniset $TEMPEST_CONFIG baremetal driver_enabled True 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 deploy_img_dir $FILES
iniset $TEMPEST_CONFIG baremetal node_uuid $IRONIC_NODE_UUID iniset $TEMPEST_CONFIG baremetal node_uuid $IRONIC_NODE_UUID
iniset $TEMPEST_CONFIG compute-feature-enabled change_password False iniset $TEMPEST_CONFIG compute-feature-enabled change_password False