From 259c65701df95b9845ff9632af30024a752821a0 Mon Sep 17 00:00:00 2001 From: cypherean Date: Mon, 22 Mar 2021 03:43:46 +0530 Subject: [PATCH] mgr/cephadm: skip-ssh flag enables cephadm mgr module This commit fixes the use of skip-ssh flag. It disables ssh config and enables the cephadm mgr module. Fixes: http://tracker.ceph.com/issues/49737 Signed-off-by: Shreyaa Sharma (cherry picked from commit 777f236ad885b03b551dd820f41a00b9c89761eb) --- src/cephadm/cephadm | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 4bd39a2a8039a..849c696888c7f 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -3670,14 +3670,7 @@ def prepare_ssh( cli: Callable, wait_for_mgr_restart: Callable ) -> None: - cli(['config-key', 'set', 'mgr/cephadm/ssh_user', ctx.ssh_user]) - - logger.info('Enabling cephadm module...') - cli(['mgr', 'module', 'enable', 'cephadm']) - wait_for_mgr_restart() - - logger.info('Setting orchestrator backend to cephadm...') - cli(['orch', 'set', 'backend', 'cephadm']) + cli(['cephadm', 'set-user', ctx.ssh_user]) if ctx.ssh_config: logger.info('Using provided ssh config...') @@ -3763,6 +3756,17 @@ def prepare_ssh( cli(['orch', 'apply', t]) +def enable_cephadm_mgr_module( + cli: Callable, wait_for_mgr_restart: Callable +) -> None: + + logger.info('Enabling cephadm module...') + cli(['mgr', 'module', 'enable', 'cephadm']) + wait_for_mgr_restart() + logger.info('Setting orchestrator backend to cephadm...') + cli(['orch', 'set', 'backend', 'cephadm']) + + def prepare_dashboard( ctx: CephadmContext, uid: int, gid: int, @@ -4055,6 +4059,8 @@ def command_bootstrap(ctx): return False is_available(ctx, 'mgr epoch %d' % epoch, mgr_has_latest_epoch) + enable_cephadm_mgr_module(cli, wait_for_mgr_restart) + # ssh if not ctx.skip_ssh: prepare_ssh(ctx, cli, wait_for_mgr_restart) -- 2.39.5