]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commit
mgr/cephadm: show unmanaged OSDs under 'osd' service
authorSage Weil <sage@newdream.net>
Thu, 11 Nov 2021 16:42:32 +0000 (11:42 -0500)
committerSage Weil <sage@newdream.net>
Thu, 11 Nov 2021 18:53:33 +0000 (13:53 -0500)
commitf13a3e5b3ca1547bba9deae3615252165bc7cac9
tree169bb64dff9499a9569db7b6fc9c55464902e4be
parent0eb651ca7f3d8679387dbf0b90e2b5b6d30e3304
mgr/cephadm: show unmanaged OSDs under 'osd' service

1- If the unit.meta file service_name = osd.NNN (which is true for lots of
OSDs deployed on older version of cephadm) then ignore the field entirely.

2- If an OSD has not service_name (see above) then show it under the 'osd'
service (instead of 'osd.unmanaged').

Sample 'ceph orch ls' output with a drivegroup + unmanaged OSD:

NAME      PORTS  RUNNING  REFRESHED  AGE  PLACEMENT
...
osd                    1  85s ago    -    <unmanaged>
osd.hdds               5  85s ago    2s   *
...

Fixes: https://tracker.ceph.com/issues/53235
Signed-off-by: Sage Weil <sage@newdream.net>
src/pybind/mgr/orchestrator/_interface.py