]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: fix bug in orphan-initial-daemons logic 39649/head
authorDaniel Pivonka <dpivonka@redhat.com>
Tue, 23 Feb 2021 20:13:12 +0000 (15:13 -0500)
committerDaniel Pivonka <dpivonka@redhat.com>
Tue, 23 Feb 2021 20:13:12 +0000 (15:13 -0500)
Signed-off-by: Daniel Pivonka <dpivonka@redhat.com>
src/cephadm/cephadm

index c3a2f9bd11cb60d2490ca419772b642985f22826..8037c6f6984d2cb7ae900d8e0fc53e7c6cc31073 100755 (executable)
@@ -3559,10 +3559,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'])