From: Alfredo Deza <adeza@redhat.com>
Date: Wed, 28 Nov 2018 12:50:50 +0000 (-0500)
Subject: ceph-volume util update is_device when reported as device or disk
X-Git-Tag: v12.2.11~94^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=74bbef817215d3bf2c4e0b5d8fa00a1346974dd4;p=ceph.git

ceph-volume util update is_device when reported as device or disk

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

diff --git a/src/ceph-volume/ceph_volume/util/device.py b/src/ceph-volume/ceph_volume/util/device.py
index 4b8a0bf296a0..8dd2772d4342 100644
--- a/src/ceph-volume/ceph_volume/util/device.py
+++ b/src/ceph-volume/ceph_volume/util/device.py
@@ -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