]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: also list vendor/model/rotational in device ls
authorJoshua Schmid <jschmid@suse.de>
Mon, 6 Jul 2020 15:41:25 +0000 (17:41 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Thu, 23 Jul 2020 13:17:10 +0000 (15:17 +0200)
Fixes: https://tracker.ceph.com/issues/45872
Signed-off-by: Joshua Schmid <jschmid@suse.de>
(cherry picked from commit 7c18893f94b01f10aa35ebcec13ee3a3a785c94a)

src/pybind/mgr/orchestrator/module.py

index 3096d0fe8907080d8261e0bc4ac1f38213f65d87..fb5df5011815f0169870583047e297c9d04efbbe 100644 (file)
@@ -310,7 +310,7 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule):
             out = []
 
             table = PrettyTable(
-                ['HOST', 'PATH', 'TYPE', 'SIZE', 'DEVICE', 'AVAIL',
+                ['HOST', 'PATH', 'TYPE', 'SIZE', 'DEVICE_ID', 'MODEL', 'VENDOR', 'ROTATIONAL', 'AVAIL',
                  'REJECT REASONS'],
                 border=False)
             table.align = 'l'
@@ -326,6 +326,9 @@ class OrchestratorCli(OrchestratorClientMixin, MgrModule):
                             d.human_readable_type,
                             format_bytes(d.sys_api.get('size', 0), 5),
                             d.device_id,
+                            d.sys_api.get('model') or 'n/a',
+                            d.sys_api.get('vendor') or 'n/a',
+                            d.sys_api.get('rotational') or 'n/a',
                             d.available,
                             ', '.join(d.rejected_reasons)
                         )