From: John Spray <john.spray@redhat.com>
Date: Fri, 7 Jul 2017 14:08:07 +0000 (-0400)
Subject: mgr: tighten initialization of keyring setting
X-Git-Tag: v12.1.2~192^2~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5e17c2889f03829020f62819987bb26333961bcb;p=ceph.git

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 <john.spray@redhat.com>
---

diff --git a/src/ceph_mgr.cc b/src/ceph_mgr.cc
index 051bed709464..6b72cf2f9bd8 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"))) {