From: Sage Weil <sage@inktank.com>
Date: Fri, 1 Jun 2012 18:02:09 +0000 (-0700)
Subject: new default keyring location for daemons
X-Git-Tag: v0.48argonaut~74^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e958efa29aebfb89b0d5e7fa0fbadc0bf241a7ca;p=ceph.git

new default keyring location for daemons

$osd_data/keyring
$mds_data/keyring

Fixes: #2498
Signed-off-by: Sage Weil <sage@inktank.com>
---

diff --git a/src/common/common_init.cc b/src/common/common_init.cc
index 2e69d771fe71..963b61573d08 100644
--- a/src/common/common_init.cc
+++ b/src/common/common_init.cc
@@ -53,6 +53,14 @@ CephContext *common_preinit(const CephInitParameters &iparams,
     conf->set_val_or_die("daemonize", "true");
     conf->set_val_or_die("log_to_stderr", "false");
     conf->set_val_or_die("err_to_stderr", "true");
+
+    // different default keyring locations for osd and mds.  this is
+    // for backward compatibility.  moving forward, we want all keyrings
+    // in these locations.  the mon already forces $mon_data/keyring.
+    if (conf->name.is_mds())
+      conf->set_val("keyring", "$mds_data/keyring", false);
+    else if (conf->name.is_osd())
+      conf->set_val("keyring", "$osd_data/keyring", false);
     break;
 
   case CODE_ENVIRONMENT_LIBRARY: