]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
cephadm: allow skipping prepare_host in bootstrap step
authorKiefer Chang <kiefer.chang@suse.com>
Mon, 24 Feb 2020 05:48:15 +0000 (13:48 +0800)
committerKiefer Chang <kiefer.chang@suse.com>
Mon, 24 Feb 2020 05:48:15 +0000 (13:48 +0800)
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>
src/cephadm/cephadm

index 7f3e5e1bcac149be9c34aca73c027ac329482160..e2320f106fe21da3a12f832a303abbdf602ff0b8 100755 (executable)
@@ -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')