]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: fix bug in orphan-initial-daemons logic
authorDaniel Pivonka <dpivonka@redhat.com>
Tue, 23 Feb 2021 20:13:12 +0000 (15:13 -0500)
committerSebastian Wagner <sebastian.wagner@suse.com>
Tue, 9 Mar 2021 09:18:50 +0000 (10:18 +0100)
Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
(cherry picked from commit 0197c7b13290e1d9b2a719ed6f2f70987c9592e3)

src/cephadm/cephadm

index aaed128d530dd0dbd77d9b93e533c7411f32cef8..6e99c0df448e5ec4e6172475839446132a987bb0 100755 (executable)
@@ -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'])