From 6c0da09b00fcfa8c4a9d34fb2ed08f6c704ed06e Mon Sep 17 00:00:00 2001 From: Jay Faulkner Date: Thu, 26 Mar 2015 15:19:32 -0700 Subject: [PATCH] Prepare devstack for Ironic cleaning testing This patch changes the two config options required for Ironic to successfully test cleaning in devstack. First, we disable erase_devices clean step. Erase devices in VMs ends up running shred on the drives for the agent driver, which is incredibly slow and completely unneeded in devstack. Additionally, we allow Ironic more time to complete the unprovision after the nova instance is deleted. This time is spend in the CLEANING state to clean up the node. This is related to the Ironic blueprint "implement-cleaning-states". Change-Id: I77081165a80491da3e66d8a4554b6d71fc3d9353 --- lib/ironic | 1 + lib/tempest | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/ironic b/lib/ironic index b99e3255d5..9651ec3189 100644 --- a/lib/ironic +++ b/lib/ironic @@ -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 diff --git a/lib/tempest b/lib/tempest index 8672a14338..c981c2ba74 100644 --- a/lib/tempest +++ b/lib/tempest @@ -476,6 +476,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