From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Wed, 27 May 2020 16:14:01 +0000 (+0200)
Subject: Merge pull request #35229 from ricardoasmarques/wip-45696
X-Git-Tag: v16.1.0~2217
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=30961b9776f8612e2b455a50433eec6a367d57f6;p=ceph.git

Merge pull request #35229 from ricardoasmarques/wip-45696

cephadm: Validate bootstrap "--dashboard-{key|crt}" path

Reviewed-by: Daniel-Pivonka <dpivonka@redhat.com>
Reviewed-by: Ernesto Puerta <epuertat@redhat.com>
---

30961b9776f8612e2b455a50433eec6a367d57f6
diff --cc src/cephadm/cephadm
index 53faf12456e3,8878587d7f21..e5253d5225c0
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@@ -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',