From: Michael Fritch <mfritch@suse.com>
Date: Wed, 4 Mar 2020 21:19:35 +0000 (-0700)
Subject: cephadm: allow prepare-host to start an enabled service
X-Git-Tag: v15.1.1~21^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f49d7e2c1e805fb191c24195272353a414b028e5;p=ceph.git

cephadm: allow prepare-host to start an enabled service

the service might be enabled, but not running

Signed-off-by: Michael Fritch <mfritch@suse.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index ae747e9e02a2..f75babd9d6b2 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1145,7 +1145,7 @@ def check_units(units, enabler=None):
             logger.info('Unit %s is enabled and running' % u)
             return True
         if enabler is not None:
-            if not enabled and installed:
+            if installed:
                 logger.info('Enabling unit %s' % u)
                 enabler.enable_service(u)
     return False