]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
mgr/cephadm: fix check-host incancations
authorSage Weil <sage@redhat.com>
Fri, 24 Jan 2020 17:41:53 +0000 (11:41 -0600)
committerSage Weil <sage@redhat.com>
Thu, 30 Jan 2020 13:11:38 +0000 (07:11 -0600)
Use 'client' as entity to get the global container_image setting.

Signed-off-by: Sage Weil <sage@redhat.com>
src/pybind/mgr/cephadm/module.py

index bd5490652bca58fcf9c1a79f19cea98235270dfa..d6e31d5b18e88c5872798812f19c122ab67a6dec 100644 (file)
@@ -922,7 +922,7 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
         'name=host,type=CephString',
         'Check whether we can access and manage a remote host')
     def _check_host(self, host):
-        out, err, code = self._run_cephadm(host, '', 'check-host', [],
+        out, err, code = self._run_cephadm(host, 'client', 'check-host', [],
                                            error_ok=True, no_fsid=True)
         if code:
             return 1, '', err
@@ -1050,7 +1050,7 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
 
         :param host: host name
         """
-        out, err, code = self._run_cephadm(host, '', 'check-host', [],
+        out, err, code = self._run_cephadm(host, 'client', 'check-host', [],
                                            error_ok=True, no_fsid=True)
         if code:
             raise OrchestratorError('New host %s failed check: %s' % (host, err))