Browse code
Update lib/ironic to always skip cleaning
Previously, devstack would disable ironic's cleaning phase if a driver
with "agent" in the name was used. However, we have begun using the IPA
ramdisk for all tests in the gate, which caused cleaning to be run for
the "pxe_ssh" job which therefore fails due to timeouts.
As a result, for now, we need to always disable cleaning.
As a point of record, we should actually be testing cleaning in the
gate. However, running 'shred' on the disks of a nested VM is too slow
and causes the gate to timeout // take too long. Some options have been
discussed for ways to test the callback mechanism but avoid actually
running 'shred' on the disks.
This needs to be revisited.
Change-Id: Id15cf6cc49122b08e557e44871b31a8c0d20b55d
Related-to-Bug: #1517277
Devananda van der Veen authored on 2015/12/04 02:16:18Showing 1 changed files
| ... | ... |
@@ -365,6 +365,9 @@ function configure_ironic_conductor {
|
| 365 | 365 |
iniset $IRONIC_CONF_FILE pxe pxe_append_params "$pxe_params" |
| 366 | 366 |
fi |
| 367 | 367 |
|
| 368 |
+ # Set these options for scenarios in which the agent fetches the image |
|
| 369 |
+ # directly from glance, and don't set them where the image is pushed |
|
| 370 |
+ # over iSCSI. |
|
| 368 | 371 |
if is_deployed_by_agent; then |
| 369 | 372 |
if [[ "$SWIFT_ENABLE_TEMPURLS" == "True" ]] ; then |
| 370 | 373 |
iniset $IRONIC_CONF_FILE glance swift_temp_url_key $SWIFT_TEMPURL_KEY |
| ... | ... |
@@ -379,9 +382,13 @@ function configure_ironic_conductor {
|
| 379 | 379 |
iniset $IRONIC_CONF_FILE glance swift_container glance |
| 380 | 380 |
iniset $IRONIC_CONF_FILE glance swift_temp_url_duration 3600 |
| 381 | 381 |
iniset $IRONIC_CONF_FILE agent heartbeat_timeout 30 |
| 382 |
- iniset $IRONIC_CONF_FILE agent agent_erase_devices_priority 0 |
|
| 383 | 382 |
fi |
| 384 | 383 |
|
| 384 |
+ # FIXME: this really needs to be tested in the gate. |
|
| 385 |
+ # For now, any test using the agent ramdisk should skip cleaning |
|
| 386 |
+ # because it is too slow to run in the gate. |
|
| 387 |
+ iniset $IRONIC_CONF_FILE agent agent_erase_devices_priority 0 |
|
| 388 |
+ |
|
| 385 | 389 |
if [[ "$IRONIC_IPXE_ENABLED" == "True" ]] ; then |
| 386 | 390 |
local pxebin |
| 387 | 391 |
pxebin=`basename $IRONIC_PXE_BOOT_IMAGE` |