Only fail Volume deletion in 'error_deleting' state
Only fail Volume deletion in 'error_deleting' state

The volume may have been in the 'error' status before we attempted to
delete it, and there is no guarantee that it has moved to 'deleting' before
we query it again. We only want to fail if there is an error *after* we
call delete, which will put the volume into the 'error_deleting' state. We
now check for that state explicitly.

Change-Id: I7e205aef46f8dd35fd605eb768a3b05360f4d374
Closes-Bug: #1496445
(cherry picked from commit fa22dfb47a5795b04adc16a16950a744c657be29)

dragorosson/heat,openstack/heat,maestro-hybrid-cloud/heat,noironetworks/heat,dims/heat,cwolferh/heat-scratch,openstack/heat,dragorosson/heat,steveb/heat,steveb/heat,noironetworks/heat,maestro-hybrid-cloud/heat,cwolferh/heat-scratch,dims/heat,jasondunsmore/heat,jasondunsmore/heat,gonzolino/heat,gonzolino/heat