cephadm: --orphan-initial-daemons now applies services unmanaged

We do not want to have orphaned daemons at all. Thus apply
services as unmanaged in order to run `ceph orch daemon add ...`
later.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit db5d3d4bd38d5f6fcbb95538c024899174cbc54f)

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index b6109bc8375a1e8d7e3023275a989886bf916dd1..b0fe25b21c986f5d0145a57ec2c0f222aad991c0 100755 (executable)
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -3539,10 +3539,17 @@ def prepare_ssh(
     except RuntimeError as e:
         raise Error('Failed to add host <%s>: %s' % (host, e))
 
-    if not ctx.orphan_initial_daemons:
-        for t in ['mon', 'mgr', 'crash']:
+    for t in ['mon', 'mgr', 'crash']:
+        if ctx.orphan_initial_daemons:
             logger.info('Deploying %s service with default placement...' % t)
-            cli(['orch', 'apply', t])
+            cli(['orch', 'apply', t, '--unmanaged'])
+        else:
+            logger.info('Deploying unmanaged %s service...' % t)
+            cli(['orch', 'apply', t, '--unmanaged'])
+
+    if not ctx.orphan_initial_daemons:
+        logger.info('Deploying crash service with default placement...')
+        cli(['orch', 'apply', 'crash'])
 
     if not ctx.skip_monitoring_stack:
         logger.info('Enabling mgr prometheus module...')
@@ -7380,7 +7387,7 @@ def _get_parser():
     parser_bootstrap.add_argument(
         '--orphan-initial-daemons',
         action='store_true',
-        help='Do not create initial mon, mgr, and crash service specs')
+        help='Set mon and mgr service to `unmanaged`, Do not create the crash service')
     parser_bootstrap.add_argument(
         '--skip-monitoring-stack',
         action='store_true',