Comment 5 for bug 1338830

There does appear to still be a gap in the previous fix. That fix assumed that cleanup only needed to happen if vm_state == RESCUED. But a rescued instance can be suspended in which case that check would fail and not try to unrescue the instance or clean up the rescued image.

It does appear that if the unrescue were attempted and then failed for any reason, perhaps due to the power state check above, Nova should still clean up the rescue instance.