cephadm: create initial mon and mgr service specs too

These will get the default placement.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 2e531239f0e98808b7911075c235c491a3e5123f..6797deb45bb4b3c3df9d65d71440599f38cb4f6c 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -2027,8 +2027,10 @@ def command_bootstrap():
         logger.info('Adding host %s...' % host)
         cli(['orch', 'host', 'add', host])
 
-        logger.info('Deploy crash collectors...')
-        cli(['orch', 'apply', 'crash', 'all:true'])
+        if not args.orphan_initial_daemons:
+            for t in ['mon', 'mgr', 'crash']:
+                logger.info('Deploying %s service with default placement...' % t)
+                cli(['orch', 'apply', t])
 
     if not args.skip_dashboard:
         logger.info('Enabling the dashboard module...')
@@ -3586,6 +3588,10 @@ def _get_parser():
         '--skip-prepare-host',
         action='store_true',
         help='Do not prepare host')
+    parser_bootstrap.add_argument(
+        '--orphan-initial-daemons',
+        action='store_true',
+        help='Do not create initial mon, mgr, and crash service specs')
 
     parser_deploy = subparsers.add_parser(
         'deploy', help='deploy a daemon')