We switched this back in devstack and things are failing again. This has
> 300 hits in just the last 24 hours. It also seems like the stack trace
is occuring on tests where they don't care about volume status leading
to some hits on sucessful runs. I couldn't think of anything better to
filter on though, this stack trace is happening a lot.
This commit is basically restoring:
change I30fb73cb44c0a90fec459a232bec4bd0945dfe51
Change-Id: If17b5e61c0e907bc5510c5d1351a3d9e1ef1ed42
Related-Bug: #1642111