Browse code

Merge "Remove baremetal tempest config setting from devstack"

Jenkins authored on 2017/01/19 19:32:20
Showing 1 changed files
... ...
@@ -495,12 +495,6 @@ function configure_tempest {
495 495
 
496 496
     # Baremetal
497 497
     if [ "$VIRT_DRIVER" = "ironic" ] ; then
498
-        iniset $TEMPEST_CONFIG baremetal driver_enabled True
499
-        iniset $TEMPEST_CONFIG baremetal unprovision_timeout $BUILD_TIMEOUT
500
-        iniset $TEMPEST_CONFIG baremetal active_timeout $BUILD_TIMEOUT
501
-        iniset $TEMPEST_CONFIG baremetal deploywait_timeout $BUILD_TIMEOUT
502
-        iniset $TEMPEST_CONFIG baremetal deploy_img_dir $FILES
503
-        iniset $TEMPEST_CONFIG baremetal node_uuid $IRONIC_NODE_UUID
504 498
         iniset $TEMPEST_CONFIG compute-feature-enabled change_password False
505 499
         iniset $TEMPEST_CONFIG compute-feature-enabled console_output False
506 500
         iniset $TEMPEST_CONFIG compute-feature-enabled interface_attach False