From e3d96f820eedf8abccf72436895d05641e7aeaca Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Fri, 4 Sep 2020 09:44:49 -0500 Subject: [PATCH] ceph-volume: simple scan should ignore tmpfs When simple scan is ran against a ceph-volume OSD, util.encryption.legacy_encrypted returns tmpfs. We want to avoid creating a Device object with tmpfs and ignore the OSD as it's not a ceph-disk created OSD. Resolves: rhbz#1872983 Signed-off-by: Andrew Schoen (cherry picked from commit ff4b7bfa573e95acf4cdc01ccf2881f0935e91d6) --- src/ceph-volume/ceph_volume/devices/simple/scan.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/ceph-volume/ceph_volume/devices/simple/scan.py b/src/ceph-volume/ceph_volume/devices/simple/scan.py index 0f83b37ef440e..34da0962b0fc8 100644 --- a/src/ceph-volume/ceph_volume/devices/simple/scan.py +++ b/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) -- 2.39.5