From: Daniel Pivonka <dpivonka@redhat.com>
Date: Tue, 23 Feb 2021 20:13:12 +0000 (-0500)
Subject: cephadm: fix bug in orphan-initial-daemons logic
X-Git-Tag: v16.2.0~119^2~54
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3a68bce18bf90c082b9fc17980b673e1c24dfe7a;p=ceph.git

cephadm: fix bug in orphan-initial-daemons logic

Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit 0197c7b13290e1d9b2a719ed6f2f70987c9592e3)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index aaed128d530dd..6e99c0df448e5 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -3570,10 +3570,10 @@ def prepare_ssh(
     except RuntimeError as e:
         raise Error('Failed to add host <%s>: %s' % (host, e))
 
-    for t in ['mon', 'mgr', 'crash']:
-        if ctx.orphan_initial_daemons:
+    for t in ['mon', 'mgr']:
+        if not ctx.orphan_initial_daemons:
             logger.info('Deploying %s service with default placement...' % t)
-            cli(['orch', 'apply', t, '--unmanaged'])
+            cli(['orch', 'apply', t])
         else:
             logger.info('Deploying unmanaged %s service...' % t)
             cli(['orch', 'apply', t, '--unmanaged'])