Add volume reset state for reserved volumes

Change-Id: I06fa2fa3e8af4f88bb7dcc60f82476a4fe08f959

diff --git a/os_cloud_cleaner/os_connector.py b/os_cloud_cleaner/os_connector.py
index 89420334741119dc7d43c375b5597a086ed6a6a1..c6c8ce58d3bb6b03fe8e1b2074214b3a73ca9c86 100644 (file)
--- a/os_cloud_cleaner/os_connector.py
+++ b/os_cloud_cleaner/os_connector.py
@@ -380,6 +380,12 @@ class OpenStackActions(object):
                     logger.error("Volume {} still attached!".format(uuid))
             raise
 
+        for uuid in existing_volumes:
+            status = self.cinder.volumes.get(uuid).status
+            if status in ["reserved"]:
+                logger.info("Resetting reserved state for volume {}".format(uuid))
+                self.cinder.volumes.reset_state(uuid, "error")
+
         for uuid in existing_volumes:
             if force_delete:
                 logger.info("Force-deleting volume {}".format(uuid))