import 14.2.4 nautilus point release

[ceph.git] / ceph / src / pybind / mgr / orchestrator_cli / module.py

diff --git a/ceph/src/pybind/mgr/orchestrator_cli/module.py b/ceph/src/pybind/mgr/orchestrator_cli/module.py
index 30740a283897698613db010eacc7f80a3fa305e9..458d53a0452cb36702041755a72fe8be5518e8e5 100644 (file)
--- a/ceph/src/pybind/mgr/orchestrator_cli/module.py
+++ b/ceph/src/pybind/mgr/orchestrator_cli/module.py
@@ -116,15 +116,16 @@ class OrchestratorCli(orchestrator.OrchestratorClientMixin, MgrModule):
 
     @_read_cli('orchestrator service ls',
                "name=host,type=CephString,req=false "
-               "name=svc_type,type=CephChoices,strings=mon|mgr|osd|mds|nfs|rgw|rbd-mirror,req=false "
+               "name=svc_type,type=CephChoices,strings=mon|mgr|osd|mds|iscsi|nfs|rgw|rbd-mirror,req=false "
                "name=svc_id,type=CephString,req=false "
-               "name=format,type=CephChoices,strings=json|plain,req=false",
+               "name=format,type=CephChoices,strings=json|plain,req=false "
+               "name=refresh,type=CephBool,req=false",
                'List services known to orchestrator')
-    def _list_services(self, host=None, svc_type=None, svc_id=None, format='plain'):
+    def _list_services(self, host=None, svc_type=None, svc_id=None, format='plain', refresh=False):
         # XXX this is kind of confusing for people because in the orchestrator
         # context the service ID for MDS is the filesystem ID, not the daemon ID
 
-        completion = self.describe_service(svc_type, svc_id, host)
+        completion = self.describe_service(svc_type, svc_id, host, refresh=refresh)
         self._orchestrator_wait([completion])
         orchestrator.raise_if_exception(completion)
         services = completion.result