Try harder to detach the server volume.

It seems to need some encouragement.

Signed-off-by: Angus Salkeld <asalkeld@redhat.com>

diff --git a/heat/engine/resources.py b/heat/engine/resources.py
index 5e965f168d59bb5d7cf634539456dbb1178f6442..c4c350f355ed773d6933ccccc18a9fd82064cf2b 100644 (file)
--- a/heat/engine/resources.py
+++ b/heat/engine/resources.py
@@ -265,12 +265,17 @@ class VolumeAttachment(Resource):
                                                        self.instance_id)
 
         self.nova().volumes.delete_server_volume(self.t['Properties']['InstanceId'],
-                                                 self.t['Properties']['VolumeId'])
+                                                 self.instance_id)
 
         vol = self.nova('volume').volumes.get(self.t['Properties']['VolumeId'])
         while vol.status == 'in-use':
             print 'trying to un-attach %s, but still %s' % (self.instance_id, vol.status)
             eventlet.sleep(1)
+            try:
+                self.nova().volumes.delete_server_volume(self.t['Properties']['InstanceId'],
+                                                         self.instance_id)
+            except:
+                pass
             vol.get()
 
         self.state_set(self.DELETE_COMPLETE)