mgr/rook: fix 'orch ps' for osds

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

diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py
index 6e3796298e31c894795d9a4aaa381d310029bac8..a8b18de0fcbb2fac766e4f48b2f0e2b72c17c77c 100644 (file)
--- a/src/pybind/mgr/rook/module.py
+++ b/src/pybind/mgr/rook/module.py
@@ -355,6 +355,8 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator):
 
             if 'ceph_daemon_id' in p['labels']:
                 sd.daemon_id = p['labels']['ceph_daemon_id']
+            elif 'ceph-osd-id' in p['labels']:
+                sd.daemon_id = p['labels']['ceph-osd-id']
             else:
                 # Unknown type -- skip it
                 continue