From f28ef954bae0761cf641214d17caec1aa575e0a5 Mon Sep 17 00:00:00 2001
From: Ben Swartzlander <ben@swartzlander.org>
Date: Fri, 5 Jan 2018 16:32:53 -0500
Subject: [PATCH] Fix volume attach error in generic driver
The generic driver doesn't understand the new 'reserved'
volume state and errors out when it detects that state.
Closes-Bug: #1741568
Change-Id: Ic14186d47b4d16a03c5c1e52933be5fa4660ee28
---
manila/share/drivers/generic.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/manila/share/drivers/generic.py b/manila/share/drivers/generic.py
index 097a8b25cb..e398ccb3e1 100644
--- a/manila/share/drivers/generic.py
+++ b/manila/share/drivers/generic.py
@@ -411,7 +411,7 @@ class GenericShareDriver(driver.ExecuteMixin, driver.ShareDriver):
volume = self.volume_api.get(context, volume['id'])
if volume['status'] == 'in-use':
return volume
- elif volume['status'] != 'attaching':
+ elif volume['status'] not in ('attaching', 'reserved'):
raise exception.ManilaException(
_('Failed to attach volume %s') % volume['id'])
time.sleep(1)