ProvisionOpenStack.destroy(): Detach volumes

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

diff --git a/teuthology/provision.py b/teuthology/provision.py
index 078794375ca5cec21a7652ff1258885144aa6564..2cb8d21e14250da9ab6f4932be558ec32c2ab183 100644 (file)
--- a/teuthology/provision.py
+++ b/teuthology/provision.py
@@ -358,6 +358,9 @@ class ProvisionOpenStack(OpenStack):
         if not self.exists(name_or_id):
             return True
         volumes = self.list_volumes(name_or_id)
+        for volume in volumes:
+            misc.sh("openstack server remove volume %s %s" %
+                    (name_or_id, volume))
         misc.sh("openstack server delete --wait " + name_or_id)
         for volume in volumes:
             misc.sh("openstack volume delete " + volume)