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 a66ff53ffd322aefa18480b9b3292c91de18568f..4cb7f12351f0ff6f8d6967b0276a09c9d1e4c0ee 100644 (file)
--- 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):
     """