mgr/orchestrator: report osds as osd.unmanaged as appropriate

If there is no osdspec_affinity or service_name (from unit.meta), then
report as 'osd.unmanaged'.

Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 5adef5f7663e25dc946a9a44d5a1ac33e8452ccf)

diff --git a/src/pybind/mgr/orchestrator/_interface.py b/src/pybind/mgr/orchestrator/_interface.py
index b27387ef8c2c48d36e9848deb52937e988570d12..04e19027ee4f1ae891be49c450cc53884bbf4b21 100644 (file)
--- a/src/pybind/mgr/orchestrator/_interface.py
+++ b/src/pybind/mgr/orchestrator/_interface.py
@@ -873,8 +873,6 @@ class DaemonDescription(object):
     def service_id(self) -> str:
         assert self.daemon_id is not None
         assert self.daemon_type is not None
-        if self.daemon_type == 'osd' and self.osdspec_affinity:
-            return self.osdspec_affinity
 
         if self._service_name:
             if '.' in self._service_name:
@@ -882,6 +880,11 @@ class DaemonDescription(object):
             else:
                 return ''
 
+        if self.daemon_type == 'osd':
+            if self.osdspec_affinity and self.osdspec_affinity != 'None':
+                return self.osdspec_affinity
+            return 'unmanaged'
+
         def _match() -> str:
             assert self.daemon_id is not None
             err = OrchestratorError("DaemonDescription: Cannot calculate service_id: "