From: Kiefer Chang <kiefer.chang@suse.com>
Date: Mon, 24 Feb 2020 05:48:15 +0000 (+0800)
Subject: cephadm: allow skipping prepare_host in bootstrap step
X-Git-Tag: v15.1.1~270^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=98a25d69c9bd25c6ae29066db3b30c4adffdb3ee;p=ceph.git

cephadm: allow skipping prepare_host in bootstrap step

There are situations that required packages are managed outside of
cephadm script, allowing skipping prepare_host in these situations.

Signed-off-by: Kiefer Chang <kiefer.chang@suse.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 7f3e5e1bcac1..e2320f106fe2 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1663,7 +1663,10 @@ def command_bootstrap():
                 raise Error('%s already exists; delete or pass '
                               '--allow-overwrite to overwrite' % f)
 
-    command_prepare_host()
+    if not args.skip_prepare_host:
+        command_prepare_host()
+    else:
+        logger.info('Skip prepare_host')
 
     # initial vars
     fsid = args.fsid or make_fsid()
@@ -3402,6 +3405,10 @@ def _get_parser():
         '--allow-fqdn-hostname',
         action='store_true',
         help='allow hostname that is fully-qualified (contains ".")')
+    parser_bootstrap.add_argument(
+        '--skip-prepare-host',
+        action='store_true',
+        help='Do not prepare host')
 
     parser_deploy = subparsers.add_parser(
         'deploy', help='deploy a daemon')