Merge pull request ceph#56933 from adk3798/service-size-cleanup

mgr/cephadm: cleanup service size logic block

Reviewed-by: Michael Fritch <[email protected]>

Author: adk3798

src/pybind/mgr/cephadm/module.py

@@ -2259,17 +2259,17 @@ def describe_service(self, service_type: Optional[str] = None, service_name: Opt
             if service_name is not None and service_name != nm:
                 continue
 
-            if spec.service_type not in ['osd', 'node-proxy']:
-                size = spec.placement.get_target_count(self.cache.get_schedulable_hosts())
+            if spec.service_type == 'osd':
+                # osd counting is special
+                size = 0
             elif spec.service_type == 'node-proxy':
                 # we only deploy node-proxy daemons on hosts we have oob info for
                 # Let's make the expected daemon count `orch ls` displays reflect that
                 schedulable_hosts = self.cache.get_schedulable_hosts()
                 oob_info_hosts = [h for h in schedulable_hosts if h.hostname in self.node_proxy_cache.oob.keys()]
                 size = spec.placement.get_target_count(oob_info_hosts)
             else:
-                # osd counting is special
-                size = 0
+                size = spec.placement.get_target_count(self.cache.get_schedulable_hosts())
 
             sm[nm] = orchestrator.ServiceDescription(
                 spec=spec,