From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Fri, 31 Jul 2020 09:09:04 +0000 (+0200)
Subject: mgr/orchestrator: For OSDs, the service_id is the osdspec_affinity
X-Git-Tag: wip-pdonnell-testing-20200918.022351~457^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=d04bfb846b78a0a53777a32526eae935e318a606;p=ceph-ci.git

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

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/src/pybind/mgr/orchestrator/_interface.py b/src/pybind/mgr/orchestrator/_interface.py
index 667cb7bc659..5835cccd0e2 100644
--- 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}'")