From: Sage Weil <sage@redhat.com>
Date: Mon, 2 Mar 2020 19:23:56 +0000 (-0600)
Subject: cephadm: remove remaining crash_keyring cruft
X-Git-Tag: v15.1.1~167^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=0752a15d52c74300a55205f8bbf7c48da595350e;p=ceph-ci.git

cephadm: remove remaining crash_keyring cruft

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index f5ba70ed8a4..5b8dda922d9 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -1096,35 +1096,6 @@ def get_config_and_keyring():
             config = f.read()
     return (config, keyring)
 
-def get_config_and_both_keyrings():
-    # type: () -> Tuple[str, str, Optional[str]]
-    if args.config_and_keyrings:
-        if args.config_and_keyrings == '-':
-            try:
-                j = injected_stdin # type: ignore
-            except NameError:
-                j = sys.stdin.read()
-        else:
-            with open(args.config_and_keyrings, 'r') as f:
-                j = f.read()
-        d = json.loads(j)
-        return (d.get('config'), d.get('keyring'), d.get('crash_keyring'))
-    else:
-        if args.key:
-            keyring = '[%s]\n\tkey = %s\n' % (args.name, args.key)
-        elif args.keyring:
-            with open(args.keyring, 'r') as f:
-                keyring = f.read()
-        else:
-            raise Error('no keyring provided')
-        crash_keyring = None
-        if args.crash_keyring:
-            with open(args.crash_keyring, 'r') as f:
-                crash_keyring = f.read()
-        with open(args.config, 'r') as f:
-            config = f.read()
-        return (config, keyring, crash_keyring)
-
 def get_container_mounts(fsid, daemon_type, daemon_id,
                          no_config=False):
     # type: (str, str, Union[int, str, None], Optional[bool]) -> Dict[str, str]
@@ -2093,7 +2064,7 @@ def command_deploy():
         raise Error('daemon type %s not recognized' % daemon_type)
 
     if daemon_type in Ceph.daemons:
-        (config, keyring, crash_keyring) = get_config_and_both_keyrings()
+        (config, keyring) = get_config_and_keyring()
         (uid, gid) = extract_uid_gid()
         make_var_run(args.fsid, uid, gid)
         c = get_container(args.fsid, daemon_type, daemon_id)
@@ -3532,9 +3503,6 @@ def _get_parser():
     parser_deploy.add_argument(
         '--keyring',
         help='keyring for new daemon')
-    parser_deploy.add_argument(
-        '--crash-keyring',
-        help='crash keyring for crash agent daemon')
     parser_deploy.add_argument(
         '--key',
         help='key for new daemon')