From 8ef9a3c84cc6eaa89e9c34302dd55f7abf8966b8 Mon Sep 17 00:00:00 2001 From: Joshua Schmid Date: Mon, 6 Jul 2020 17:41:25 +0200 Subject: [PATCH] mgr/cephadm: also list vendor/model/rotational in device ls Fixes: https://tracker.ceph.com/issues/45872 Signed-off-by: Joshua Schmid (cherry picked from commit 7c18893f94b01f10aa35ebcec13ee3a3a785c94a) --- src/pybind/mgr/orchestrator/module.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pybind/mgr/orchestrator/module.py b/src/pybind/mgr/orchestrator/module.py index 3096d0fe89070..fb5df5011815f 100644 --- a/src/pybind/mgr/orchestrator/module.py +++ b/src/pybind/mgr/orchestrator/module.py @@ -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) ) -- 2.39.5