mgr/orchestrator: For OSDs, the service_id is the osdspec_affinity

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit d04bfb846b78a0a53777a32526eae935e318a606)

diff --git a/src/pybind/mgr/orchestrator/_interface.py b/src/pybind/mgr/orchestrator/_interface.py
index 667cb7bc659205c8b5df1bb8b1c7ea041c947397..5835cccd0e22b4136cfa96fa0d9d1818d5d1c16e 100644 (file)
--- a/src/pybind/mgr/orchestrator/_interface.py
+++ b/src/pybind/mgr/orchestrator/_interface.py
@@ -1312,6 +1312,9 @@ class DaemonDescription(object):
         return False
 
     def service_id(self):
+        if self.daemon_type == 'osd' and self.osdspec_affinity:
+            return self.osdspec_affinity
+
         def _match():
             err = OrchestratorError("DaemonDescription: Cannot calculate service_id: " \
                     f"daemon_id='{self.daemon_id}' hostname='{self.hostname}'")