From: Sage Weil <sage@redhat.com>
Date: Mon, 16 Dec 2019 18:54:37 +0000 (-0600)
Subject: python-common: 'ssd/nvme' -> 'ssd'
X-Git-Tag: v15.1.0~455^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e78cd9c5a355aa21ef6a1f385d72d95dce2384df;p=ceph.git

python-common: 'ssd/nvme' -> 'ssd'

NVMe's are generally 'solid state disks'.  More importantly, NVMe is an
interface, not a device type, and there is talk of HDDs with NVMe
interfaces.

But mostly this is just makes for a more compact table.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/python-common/ceph/deployment/inventory.py b/src/python-common/ceph/deployment/inventory.py
index 5edd27c4be7b..22109c567fc5 100644
--- a/src/python-common/ceph/deployment/inventory.py
+++ b/src/python-common/ceph/deployment/inventory.py
@@ -82,4 +82,4 @@ class Device(object):
         # type: () -> str
         if self.sys_api is None or 'rotational' not in self.sys_api:
             return "unknown"
-        return 'hdd' if self.sys_api["rotational"] == "1" else 'ssd/nvme'
+        return 'hdd' if self.sys_api["rotational"] == "1" else 'ssd'