@@ -370,6 +370,7 @@ function configure_ironic_conductor {

         iniset $IRONIC_CONF_FILE glance swift_container glance

         iniset $IRONIC_CONF_FILE glance swift_temp_url_duration 3600

         iniset $IRONIC_CONF_FILE agent heartbeat_timeout 30

+        iniset $IRONIC_CONF_FILE agent agent_erase_devices_priority 0

     fi

     if [[ "$IRONIC_IPXE_ENABLED" == "True" ]] ; then

@@ -469,6 +469,7 @@ function configure_tempest {

     # Baremetal

     if [ "$VIRT_DRIVER" = "ironic" ] ; then

         iniset $TEMPEST_CONFIG baremetal driver_enabled True

+        iniset $TEMPEST_CONFIG baremetal unprovision_timeout 300

         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