mgr/cephadm: base upgrade check on return code, not stderr

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 cccb7756cddc32d7effcd7dc180710b92bd08d51..d64701b71bda9775a71e2a30fe6ca670df628418 100644 (file)
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -395,7 +395,7 @@ class CephadmOrchestrator(MgrModule, orchestrator.OrchestratorClientMixin):
             })
             if not self.upgrade_state or self.upgrade_state.get('paused'):
                 return False
-            if err:
+            if ret:
                 self.log.info('Upgrade: not safe to stop %s.%s' %
                               (s.service_type, s.service_instance))
                 time.sleep(15)