From 1131bc09b2bb0cd7cc318062df0977440a12929d Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 9 Mar 2020 13:40:22 -0500 Subject: [PATCH] cephadm: no need to pregenerate a crash key for the bootstrap host mgr/cephadm can do this later when it deploys the crash daemon(s). Signed-off-by: Sage Weil --- src/cephadm/cephadm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm index 0bb96ef3041..2e531239f0e 100755 --- a/src/cephadm/cephadm +++ b/src/cephadm/cephadm @@ -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) -- 2.39.5