]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/rook: make 'osd' unmanaged service appear as unmanaged
authorSage Weil <sage@newdream.net>
Thu, 4 Nov 2021 15:49:07 +0000 (10:49 -0500)
committerSage Weil <sage@newdream.net>
Mon, 8 Nov 2021 19:30:16 +0000 (13:30 -0600)
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>
src/pybind/mgr/rook/module.py

index 2a8a140487d675908c974a981d806010d0d110f7..160c87d7fad5a8133670b1579afa7aec109ae113 100644 (file)
@@ -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