From 20c2b8891a1d129d9bb5ef254bb4a96b1a6fabf7 Mon Sep 17 00:00:00 2001 From: Angus Salkeld Date: Tue, 10 Apr 2012 14:13:06 +1000 Subject: [PATCH] Try harder to detach the server volume. It seems to need some encouragement. Signed-off-by: Angus Salkeld --- heat/engine/resources.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/heat/engine/resources.py b/heat/engine/resources.py index 5e965f16..c4c350f3 100644 --- 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) -- 2.45.2