From: Shweta Bhosale <Shweta.Bhosale1@ibm.com>
Date: Thu, 2 Apr 2026 06:42:47 +0000 (+0530)
Subject: cephadm: fix bootstrap ordering, configure SSH keys before set-user
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=30cb2e354b909d80a4e0d024258b9d155ba84205;p=ceph.git

cephadm: fix bootstrap ordering, configure SSH keys before set-user
Fixes: https://tracker.ceph.com/issues/74045

Signed-off-by: Shweta Bhosale <Shweta.Bhosale1@ibm.com>
---

diff --git a/src/cephadm/cephadm.py b/src/cephadm/cephadm.py
index 34e1f1b5ed2..c98805f6c7f 100755
--- a/src/cephadm/cephadm.py
+++ b/src/cephadm/cephadm.py
@@ -2431,8 +2431,7 @@ def prepare_ssh(
     cli: Callable, wait_for_mgr_restart: Callable
 ) -> None:
 
-    cli(['cephadm', 'set-user', ctx.ssh_user])
-
+    # SSH identity must be in the mgr before set-user
     if ctx.ssh_config:
         logger.info('Using provided ssh config...')
         mounts = {
@@ -2467,6 +2466,8 @@ def prepare_ssh(
         logger.info('Wrote public SSH key to %s' % ctx.output_pub_ssh_key)
         authorize_ssh_key(ssh_pub, ctx.ssh_user)
 
+    cli(['cephadm', 'set-user', ctx.ssh_user])
+
     host = get_hostname()
     logger.info('Adding host %s...' % host)
     try: