From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Wed, 3 Jun 2020 07:51:31 +0000 (+0200)
Subject: Merge pull request #35262 from jmolmo/cephadm_shared_folders
X-Git-Tag: v16.1.0~2163
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=15153f6349536833e4615416483c1a7935aa71b1;p=ceph.git

Merge pull request #35262 from jmolmo/cephadm_shared_folders

cephadm: Make easy manager modules development

Reviewed-by: Alfonso Martínez <almartin@redhat.com>
Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

15153f6349536833e4615416483c1a7935aa71b1
diff --cc src/cephadm/cephadm
index 8e3e77b99f4b,7855977592ad..b672fd404c0e
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@@ -4563,11 -4561,12 +4583,16 @@@ def _get_parser()
          '--skip-monitoring-stack',
          action='store_true',
          help='Do not automatically provision monitoring stack (prometheus, grafana, alertmanager, node-exporter)')
 +    parser_bootstrap.add_argument(
 +        '--apply-spec',
 +        help='Apply cluster spec after bootstrap (copy ssh key, add hosts and apply services)')
 +
  
+     parser_bootstrap.add_argument(
+         '--shared_ceph_folder',
+         metavar='CEPH_SOURCE_FOLDER',
+         help='Development mode. Several folders in containers are volumes mapped to different sub-folders in the ceph source folder')
+ 
      parser_deploy = subparsers.add_parser(
          'deploy', help='deploy a daemon')
      parser_deploy.set_defaults(func=command_deploy)