mgr/cephadm: fix upgrade wait loop

This was succeeding after 4 tries even though it wasn't ok-to-stop.

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

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 744071bd9968ae8b5ffbbdfbb8cc5e88868b6f96..d73da8ba087e9d515ca665685fad380f1c6970e7 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -579,9 +579,7 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
                 self.log.info('Upgrade: It is safe to stop %s.%s' %
                               (s.daemon_type, s.daemon_id))
                 return True
-        self.log.info('Upgrade: It is safe to stop %s.%s' %
-                      (s.daemon_type, s.daemon_id))
-        return True
+        return False
 
     def _clear_upgrade_health_checks(self):
         for k in ['UPGRADE_NO_STANDBY_MGR',