]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #40319 from cypherean/skip_ssh_patch
authorKefu Chai <kchai@redhat.com>
Fri, 16 Apr 2021 04:46:36 +0000 (12:46 +0800)
committerGitHub <noreply@github.com>
Fri, 16 Apr 2021 04:46:36 +0000 (12:46 +0800)
mgr/cephadm: skip-ssh flag enables cephadm mgr module

Reviewed-by: Adam King <adking@redhat.com>
1  2 
src/cephadm/cephadm

index 0a2134a7bb1f76923ef425b706a713ed29463f98,8e781d8ed7489d2134e0b472ba337785bafeb191..efa556f7e8f7e86c248942629e2795115fd0de96
@@@ -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)