From: Zack Cerza <zack@redhat.com>
Date: Thu, 22 Oct 2015 21:14:36 +0000 (-0600)
Subject: Skip volume detachment on broken instances
X-Git-Tag: 1.1.0~782^2~3
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=bd58c5261e34daa180d4ff60bcc92bce32dede0c;p=teuthology.git

Skip volume detachment on broken instances

That is, if the state is 'ERROR', don't attempt to detach volumes before
deleting.

Signed-off-by: Zack Cerza <zack@redhat.com>
---

diff --git a/teuthology/provision.py b/teuthology/provision.py
index 45beb0437f..6280594103 100644
--- a/teuthology/provision.py
+++ b/teuthology/provision.py
@@ -278,8 +278,10 @@ class ProvisionOpenStack(OpenStack):
         :param server_info: Optionally, use already-retrieved results of
                             self.show()
         """
-        if not server_info:
+        if server_info is None:
             server_info = self.show(name_or_id)
+        if not server_info:
+            return []
         volumes = self.get_value(server_info,
                                  'os-extended-volumes:volumes_attached')
         return [volume['id'] for volume in volumes ]
@@ -363,9 +365,15 @@ class ProvisionOpenStack(OpenStack):
         if not self.exists(name_or_id, server_info=server_info):
             return True
         volumes = self.list_volumes(name_or_id, server_info=server_info)
-        for volume in volumes:
-            misc.sh("openstack server remove volume %s %s" %
-                    (name_or_id, volume))
+        if self.get_value(server_info, 'status').lower() == 'error':
+            log.info(
+                "Instance %s is in an error state; skipping volume detachment",
+                name_or_id
+            )
+        else:
+            for volume in volumes:
+                misc.sh("openstack server remove volume %s %s" %
+                        (name_or_id, volume))
         misc.sh("openstack server delete " + name_or_id)
         for volume in volumes:
             misc.sh("openstack volume delete " + volume)