From ff83aaeeb4cf17f8b8db6b5395a38213552b8493 Mon Sep 17 00:00:00 2001
From: rabi <ramishra@redhat.com>
Date: Tue, 18 Sep 2018 11:52:24 +0530
Subject: [PATCH] Consider volume in 'reserved' status as detachment in
 progress

It's possible that a volume can end up in `reserved` state
when volume attachment fails. We should wait for it to be
available when detaching.

Change-Id: Ieb1d12ea9d7c8c76c448387fadfb2e4dbf4cbb2e
Story: #2003789
Task: 26497
---
 heat/engine/clients/os/cinder.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/heat/engine/clients/os/cinder.py b/heat/engine/clients/os/cinder.py
index 7e876efd55..02903c9cef 100644
--- a/heat/engine/clients/os/cinder.py
+++ b/heat/engine/clients/os/cinder.py
@@ -140,7 +140,7 @@ class CinderClientPlugin(client_plugin.ClientPlugin):
         if server_id and server_id not in server_ids:
             return True
 
-        if vol.status in ('in-use', 'detaching'):
+        if vol.status in ('in-use', 'detaching', 'reserved'):
             LOG.debug('%s - volume still in use', vol_id)
             return False