commit e19c8c34c56257b31b2d8f8a30ce928d76a65d45
author Jenkins <jenkins@review.openstack.org> Thu Jan 19 10:32:20 2017 +0000
committer Gerrit Code Review <review@openstack.org> Thu Jan 19 10:32:20 2017 +0000
tree a8d29d18159927513b3fd9cb54e35ccd60de6aa6
parent b1d3977daf6463854b44fc710d3149a064908035
parent 470580bba68e5dc727ceb4d575649cb143eef7d5

Merge "Remove baremetal tempest config setting from devstack"

lib/tempest

diff --git a/lib/tempest b/lib/tempest
index deffcfa..3312522 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -495,12 +495,6 @@
 
     # 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 deploywait_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
         iniset $TEMPEST_CONFIG compute-feature-enabled console_output False
         iniset $TEMPEST_CONFIG compute-feature-enabled interface_attach False