From: Jeff Layton <jlayton@redhat.com>
Date: Tue, 30 Oct 2018 18:21:33 +0000 (-0400)
Subject: orchestrator: rework describe_service prototype to allow for nodename
X-Git-Tag: v14.1.0~885^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=99cbbdd5a1b128a4adca3e26dab754fcabd9d2c4;p=ceph.git

orchestrator: rework describe_service prototype to allow for nodename

...and a new service_type field in ServiceLocation object.

Signed-off-by: Jeff Layton <jlayton@redhat.com>
---

diff --git a/src/pybind/mgr/orchestrator.py b/src/pybind/mgr/orchestrator.py
index a66ff53ffd32..4cb7f12351f0 100644
--- a/src/pybind/mgr/orchestrator.py
+++ b/src/pybind/mgr/orchestrator.py
@@ -154,7 +154,7 @@ class Orchestrator(object):
         """
         raise NotImplementedError()
 
-    def describe_service(self, service_type, service_id):
+    def describe_service(self, service_type=None, service_id=None, node_name=None):
         """
         Describe a service (of any kind) that is already configured in
         the orchestrator.  For example, when viewing an OSD in the dashboard
@@ -320,6 +320,9 @@ class ServiceLocation(object):
         # in the FSMap/ServiceMap.
         self.daemon_name = None
 
+        # The type of service (osd, mon, mgr, etc.)
+        self.service_type = None
+
 
 class ServiceDescription(object):
     """