From e958efa29aebfb89b0d5e7fa0fbadc0bf241a7ca Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 1 Jun 2012 11:02:09 -0700 Subject: [PATCH] new default keyring location for daemons $osd_data/keyring $mds_data/keyring Fixes: #2498 Signed-off-by: Sage Weil --- src/common/common_init.cc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/common/common_init.cc b/src/common/common_init.cc index 2e69d771fe71b..963b61573d086 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: -- 2.39.5