]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
pybind/mgr/cephadm: return -ENOENT if self.ssh_user is None 38935/head
authorKefu Chai <kchai@redhat.com>
Thu, 21 Jan 2021 16:11:39 +0000 (00:11 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 26 Jan 2021 10:02:24 +0000 (18:02 +0800)
there is chance that self.ssh_user is None when handling "cephadm
get-user" command, so return -ENOENT and error messages in that case.

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/pybind/mgr/cephadm/module.py

index 9f0895ff363e834ba01ecf30c2e1cb86e20b67c6..f389c57483a71c1529355d30eee342ddd6d5fafe 100644 (file)
@@ -819,7 +819,10 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule,
         """
         Show user for SSHing to cluster hosts
         """
-        return 0, self.ssh_user, ''
+        if self.ssh_user is None:
+            return -errno.ENOENT, '', 'No cluster SSH user configured'
+        else:
+            return 0, self.ssh_user, ''
 
     @orchestrator._cli_read_command(
         'cephadm set-user')