ceph-volume util.encryption if crypt path does not exist, skip it

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit 635f8e9e2ecdad5c54a599029bdad74e88fad600)

diff --git a/src/ceph-volume/ceph_volume/util/encryption.py b/src/ceph-volume/ceph_volume/util/encryption.py
index 0abe9b6c189d0d7f6e9b9c7d77f1225ec25202fc..cc594a07e8304793f54d34b9043eed5aedcb9365 100644 (file)
--- a/src/ceph-volume/ceph_volume/util/encryption.py
+++ b/src/ceph-volume/ceph_volume/util/encryption.py
@@ -96,6 +96,10 @@ def dmcrypt_close(mapping):
 
     :param mapping:
     """
+    if not os.path.exists(mapping):
+        logger.debug('device mapper path does not exist %s' % mapping)
+        logger.debug('will skip cryptsetup removal')
+        return
     process.run(['cryptsetup', 'remove', mapping])