mgr/orchestrator: added useful attributes to ServiceDescription

Signed-off-by: Ricardo Dias <rdias@suse.com>

diff --git a/src/pybind/mgr/orchestrator.py b/src/pybind/mgr/orchestrator.py
index 4a0190fad7db72b0165b0b0be5dff6ffe2175c4d..b71002f5a540d24bf042cbb8b4f22c4ad562fb39 100644 (file)
--- a/src/pybind/mgr/orchestrator.py
+++ b/src/pybind/mgr/orchestrator.py
@@ -333,6 +333,17 @@ class ServiceDescription(object):
         # The type of service (osd, mon, mgr, etc.)
         self.service_type = None
 
+        # Service version that was deployed
+        self.version = None
+
+        # Location of the service configuration when stored in rados
+        # object. Format: "rados://<pool>/[<namespace/>]<object>"
+        self.rados_config_location = None
+
+        # If the service exposes REST-like API, this attribute should hold
+        # the URL.
+        self.service_url = None
+
 
 class DriveGroupSpec(object):
     """

diff --git a/src/pybind/mgr/orchestrator_cli/module.py b/src/pybind/mgr/orchestrator_cli/module.py
index 756f932636612285e6c64cece9f1a7e8c1c2d3c0..4e8d4b268596511c2c83f3eb85cafa17bbc29906 100644 (file)
--- a/src/pybind/mgr/orchestrator_cli/module.py
+++ b/src/pybind/mgr/orchestrator_cli/module.py
@@ -171,11 +171,13 @@ class OrchestratorCli(MgrModule):
             services.sort(key = lambda s: (s.service_type, s.nodename, s.daemon_name))
             lines = []
             for s in services:
-                lines.append("{0}.{1} {2} {3}".format(
+                lines.append("{0}.{1} {2} {3} {4} {5}".format(
                     s.service_type,
                     s.daemon_name,
                     s.nodename,
-                    s.container_id))
+                    s.container_id,
+                    s.version,
+                    s.config_location))
 
             return HandleCommandResult(odata="\n".join(lines))