]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/orchestrator: add --refresh to `ceph orchestrator service ls` 29060/head
authorTim Serong <tserong@suse.com>
Thu, 25 Jul 2019 06:30:04 +0000 (16:30 +1000)
committerSebastian Wagner <sebastian.wagner@suse.com>
Wed, 31 Jul 2019 13:38:26 +0000 (15:38 +0200)
`ceph orchestrator device ls` already supports --refresh to force
a reload, we should support this for `ceph orchestrator service ls`
as well.

Signed-off-by: Tim Serong <tserong@suse.com>
(cherry picked from commit d5e320ae541cabb2bfdfe20e68fa88233999b63c)

src/pybind/mgr/orchestrator_cli/module.py

index 22604f0ee8cf1af0da7c87801f7b03e08bafda14..458d53a0452cb36702041755a72fe8be5518e8e5 100644 (file)
@@ -118,13 +118,14 @@ class OrchestratorCli(orchestrator.OrchestratorClientMixin, MgrModule):
                "name=host,type=CephString,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