From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 28 Nov 2018 18:26:59 +0000 (-0500)
Subject: ceph-volume util.device check both dm and mapper paths for is_mapper property
X-Git-Tag: v13.2.5~144^2~2^2~10
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0deb2a6329a39fca67b82ce20efe0aaac648e11f;p=ceph.git

ceph-volume util.device check both dm and mapper paths for is_mapper property

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

diff --git a/src/ceph-volume/ceph_volume/util/device.py b/src/ceph-volume/ceph_volume/util/device.py
index bdd7c3e4d19f..5e8ebf561e4e 100644
--- a/src/ceph-volume/ceph_volume/util/device.py
+++ b/src/ceph-volume/ceph_volume/util/device.py
@@ -256,7 +256,7 @@ class Device(object):
 
     @property
     def is_mapper(self):
-        return self.path.startswith('/dev/mapper')
+        return self.path.startswith(('/dev/mapper', '/dev/dm-'))
 
     @property
     def is_lv(self):