Import ceph 15.2.8

[ceph.git] / ceph / src / ceph-volume / ceph_volume / devices / simple / scan.py

diff --git a/ceph/src/ceph-volume/ceph_volume/devices/simple/scan.py b/ceph/src/ceph-volume/ceph_volume/devices/simple/scan.py
index 0f83b37ef440ee489376740674c55172ab1dfb23..34da0962b0fc8639cc6bc095c8e29f169ffe1e35 100644 (file)
--- a/ceph/src/ceph-volume/ceph_volume/devices/simple/scan.py
+++ b/ceph/src/ceph-volume/ceph_volume/devices/simple/scan.py
@@ -375,8 +375,11 @@ class Scan(object):
             self.encryption_metadata = encryption.legacy_encrypted(args.osd_path)
             self.is_encrypted = self.encryption_metadata['encrypted']
 
-            device = Device(self.encryption_metadata['device'])
-            if not device.is_ceph_disk_member:
-                terminal.warning("Ignoring %s because it's not a ceph-disk created osd." % path)
+            if self.encryption_metadata['device'] != "tmpfs":
+                device = Device(self.encryption_metadata['device'])
+                if not device.is_ceph_disk_member:
+                    terminal.warning("Ignoring %s because it's not a ceph-disk created osd." % path)
+                else:
+                    self.scan(args)
             else:
-                self.scan(args)
+                terminal.warning("Ignoring %s because it's not a ceph-disk created osd." % path)