]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph-volume util update is_device when reported as device or disk
authorAlfredo Deza <adeza@redhat.com>
Wed, 28 Nov 2018 12:50:50 +0000 (07:50 -0500)
committerAlfredo Deza <adeza@redhat.com>
Fri, 30 Nov 2018 19:07:37 +0000 (14:07 -0500)
Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit f74635d16d7ceefb8e0de02ded85a6e7be53457f)

src/ceph-volume/ceph_volume/util/device.py

index 4b8a0bf296a03c4e236bfb8cde5b6af90d6dc3ce..8dd2772d4342e575cd59260f39fda46551bc4761 100644 (file)
@@ -268,7 +268,10 @@ class Device(object):
     @property
     def is_device(self):
         if self.disk_api:
-            return self.disk_api['TYPE'] == 'device'
+            is_device = self.disk_api['TYPE'] == 'device'
+            is_disk = self.disk_api['TYPE'] == 'disk'
+            if is_device or is_disk:
+                return True
         return False
 
     @property