From: Sage Weil <sage@newdream.net>
Date: Thu, 4 Nov 2021 15:49:07 +0000 (-0500)
Subject: mgr/rook: make 'osd' unmanaged service appear as unmanaged
X-Git-Tag: v17.1.0~469^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=1838770f0cf90069b901c03bb24687eba510ddbb;p=ceph-ci.git

mgr/rook: make 'osd' unmanaged service appear as unmanaged

This makes it match the cephadm result, where e.g., the placement
shows as '<unmanaged>' in 'orch ls'.

Signed-off-by: Sage Weil <sage@newdream.net>
---

diff --git a/src/pybind/mgr/rook/module.py b/src/pybind/mgr/rook/module.py
index 2a8a140487d..160c87d7fad 100644
--- a/src/pybind/mgr/rook/module.py
+++ b/src/pybind/mgr/rook/module.py
@@ -371,12 +371,12 @@ class RookOrchestrator(MgrModule, orchestrator.Orchestrator):
             svc = 'osd'
             spec[svc] = orchestrator.ServiceDescription(
                 spec=DriveGroupSpec(
+                    unmanaged=True,
                     service_type='osd',
-                    placement=PlacementSpec(count=len(all_osds), hosts=[osd.metadata.labels['topology-location-host'] for osd in all_osds]),
                 ),
                 size=len(all_osds),
                 last_refresh=now,
-                running= sum(osd.status.phase == 'Running' for osd in all_osds)
+                running=sum(osd.status.phase == 'Running' for osd in all_osds)
             )
 
             # drivegroups