From: Sage Weil <sage@redhat.com>
Date: Fri, 13 Mar 2020 16:03:30 +0000 (-0400)
Subject: mgr/rook: fix 'orch ps' for osds
X-Git-Tag: v15.2.0~3^2~8
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=60d98dfe25d4efa6db15dfe5d1519b4da900d390;p=ceph.git

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 6e3796298e31..a8b18de0fcbb 100644
--- 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