From: Sage Weil <sage@redhat.com>
Date: Fri, 8 Nov 2019 16:29:17 +0000 (-0600)
Subject: mgr/ssh: handle lack of node hints more gracefully
X-Git-Tag: v15.1.0~977^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F31488%2Fhead;p=ceph.git

mgr/ssh: handle lack of node hints more gracefully

RuntimeError: Remote method threw exception: TypeError: object of type 'NoneType' has no len()

isn't friendly

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/ssh/module.py b/src/pybind/mgr/ssh/module.py
index 5e8ea6639fe3..07f4f1b0f45c 100644
--- a/src/pybind/mgr/ssh/module.py
+++ b/src/pybind/mgr/ssh/module.py
@@ -990,7 +990,7 @@ class SSHOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
         return SSHWriteCompletion(results)
 
     def add_mds(self, spec):
-        if len(spec.placement.nodes) < spec.count:
+        if not spec.placement.nodes or len(spec.placement.nodes) < spec.count:
             raise RuntimeError("must specify at least %d hosts" % spec.count)
         daemons = self._get_services('mds')
         results = []
@@ -1040,7 +1040,7 @@ class SSHOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
         return SSHWriteCompletion(results)
 
     def add_rgw(self, spec):
-        if len(spec.placement.nodes) < spec.count:
+        if not spec.placement.nodes or len(spec.placement.nodes) < spec.count:
             raise RuntimeError("must specify at least %d hosts" % spec.count)
         # ensure rgw_zone is set for these daemons
         ret, out, err = self.mon_command({