From: Kefu Chai <kchai@redhat.com>
Date: Fri, 16 Apr 2021 04:46:36 +0000 (+0800)
Subject: Merge pull request #40319 from cypherean/skip_ssh_patch
X-Git-Tag: v17.1.0~2232
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=03f47d0dfec6399ce74200a80b0797d63b460cb7;p=ceph.git

Merge pull request #40319 from cypherean/skip_ssh_patch

mgr/cephadm: skip-ssh flag enables cephadm mgr module

Reviewed-by: Adam King <adking@redhat.com>
---

03f47d0dfec6399ce74200a80b0797d63b460cb7
diff --cc src/cephadm/cephadm
index 0a2134a7bb1f,8e781d8ed748..efa556f7e8f7
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@@ -4055,7 -3951,10 +4059,9 @@@ 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
 -    host = None
      if not ctx.skip_ssh:
          prepare_ssh(ctx, cli, wait_for_mgr_restart)