From: Sage Weil Date: Fri, 24 Jan 2020 17:41:53 +0000 (-0600) Subject: mgr/cephadm: fix check-host incancations X-Git-Tag: v15.1.1~568^2~11 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6e287da4864d7aada751e74dfcc0158d2933b191;p=ceph.git mgr/cephadm: fix check-host incancations Use 'client' as entity to get the global container_image setting. Signed-off-by: Sage Weil --- diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py index bd5490652bca..d6e31d5b18e8 100644 --- a/src/pybind/mgr/cephadm/module.py +++ b/src/pybind/mgr/cephadm/module.py @@ -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))