From: Jeff Layton <jlayton@redhat.com>
Date: Wed, 19 Dec 2018 11:12:02 +0000 (-0500)
Subject: mgr/orchestrator: fix _list_services display
X-Git-Tag: v14.1.0~584^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=da6ae669df890bdbed6bfcf3b66ea8b42ae29b86;p=ceph.git

mgr/orchestrator: fix _list_services display

I see this error when using "ceph orchestrator service ls":

Error EINVAL: Traceback (most recent call last):
  File "/usr/lib64/ceph/mgr/orchestrator_cli/module.py", line 318, in handle_command
    return self._handle_command(inbuf, cmd)
  File "/usr/lib64/ceph/mgr/orchestrator_cli/module.py", line 330, in _handle_command
    return self._list_services(cmd)
  File "/usr/lib64/ceph/mgr/orchestrator_cli/module.py", line 165, in _list_services
    s.config_location))
AttributeError: 'ServiceDescription' object has no attribute 'config_location'

The config_locations field should be rados_config_location.

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

diff --git a/src/pybind/mgr/orchestrator_cli/module.py b/src/pybind/mgr/orchestrator_cli/module.py
index 0dab0d0d5b7c..ad5210ba8ecf 100644
--- a/src/pybind/mgr/orchestrator_cli/module.py
+++ b/src/pybind/mgr/orchestrator_cli/module.py
@@ -162,7 +162,7 @@ class OrchestratorCli(MgrModule):
                     s.nodename,
                     s.container_id,
                     s.version,
-                    s.config_location))
+                    s.rados_config_location))
 
             return HandleCommandResult(odata="\n".join(lines))