]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #35229 from ricardoasmarques/wip-45696
authorSebastian Wagner <sebastian.wagner@suse.com>
Wed, 27 May 2020 16:14:01 +0000 (18:14 +0200)
committerGitHub <noreply@github.com>
Wed, 27 May 2020 16:14:01 +0000 (18:14 +0200)
cephadm: Validate bootstrap "--dashboard-{key|crt}" path

Reviewed-by: Daniel-Pivonka <dpivonka@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
1  2 
src/cephadm/cephadm

index 53faf12456e380f980e45956c4d0a4c7c087f867,8878587d7f217c052844278bfd4385a9ad20ccc4..e5253d5225c0e84b311d7e9c4db22d700df6d3cb
@@@ -4475,21 -4464,9 +4477,22 @@@ def _get_parser()
          help='Dashboard key')
      parser_bootstrap.add_argument(
          '--dashboard-crt',
+         type=argparse.FileType('r'),
          help='Dashboard certificate')
  
 +    parser_bootstrap.add_argument(
 +        '--ssh-config',
 +        type=argparse.FileType('r'),
 +        help='SSH config')
 +    parser_bootstrap.add_argument(
 +        '--ssh-private-key',
 +        type=argparse.FileType('r'),
 +        help='SSH private key')
 +    parser_bootstrap.add_argument(
 +        '--ssh-public-key',
 +        type=argparse.FileType('r'),
 +        help='SSH public key')
 +
      parser_bootstrap.add_argument(
          '--skip-mon-network',
          action='store_true',