]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cephadm: no need to pregenerate a crash key for the bootstrap host
authorSage Weil <sage@redhat.com>
Mon, 9 Mar 2020 18:40:22 +0000 (13:40 -0500)
committerSage Weil <sage@redhat.com>
Tue, 10 Mar 2020 13:43:05 +0000 (08:43 -0500)
mgr/cephadm can do this later when it deploys the crash daemon(s).

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

index 0bb96ef304132b63d6ba40f033b453d4067aa489..2e531239f0e98808b7911075c235c491a3e5123f 100755 (executable)
@@ -1817,11 +1817,6 @@ def command_bootstrap():
         entrypoint='/usr/bin/ceph-authtool',
         args=['--gen-print-key'],
     ).run().strip()
-    crash_key = CephContainer(
-        image=args.image,
-        entrypoint='/usr/bin/ceph-authtool',
-        args=['--gen-print-key'],
-    ).run().strip()
 
     keyring = ('[mon.]\n'
                '\tkey = %s\n'
@@ -1837,11 +1832,7 @@ def command_bootstrap():
                '\tcaps mon = profile mgr\n'
                '\tcaps mds = allow *\n'
                '\tcaps osd = allow *\n'
-               '[client.crash.%s]\n'
-               '\tkey = %s\n'
-               '\tcaps mon = profile crash\n'
-               '\tcaps mgr = profile crash\n'
-               % (mon_key, admin_key, mgr_id, mgr_key, hostname, crash_key))
+               % (mon_key, admin_key, mgr_id, mgr_key))
 
     # tmp keyring file
     tmp_bootstrap_keyring = write_tmp(keyring, uid, gid)