From 5e17c2889f03829020f62819987bb26333961bcb Mon Sep 17 00:00:00 2001 From: John Spray Date: Fri, 7 Jul 2017 10:08:07 -0400 Subject: [PATCH] mgr: tighten initialization of keyring setting We should not proceed if setting this fails. Also the meta=false setting is not what you want when calling into set_val after initialization, I'm not sure how that ever worked! Signed-off-by: John Spray --- src/ceph_mgr.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ceph_mgr.cc b/src/ceph_mgr.cc index 051bed70946..6b72cf2f9bd 100644 --- a/src/ceph_mgr.cc +++ b/src/ceph_mgr.cc @@ -45,7 +45,7 @@ int main(int argc, const char **argv) CODE_ENVIRONMENT_DAEMON, 0, "mgr_data"); // For consumption by KeyRing::from_ceph_context in MonClient - g_conf->set_val("keyring", "$mgr_data/keyring", false); + g_conf->set_val_or_die("keyring", "$mgr_data/keyring"); // Handle --help if ((args.size() == 1 && (std::string(args[0]) == "--help" || std::string(args[0]) == "-h"))) { -- 2.39.5