diff options
| author | Sage Weil <sage@inktank.com> | 2012-06-01 11:02:09 -0700 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-06-12 11:50:54 -0700 |
| commit | e958efa29aebfb89b0d5e7fa0fbadc0bf241a7ca (patch) | |
| tree | ee785f63f45d193ea1a081a017e7e9256cf1bf85 /src/common | |
| parent | eeeb5993b425e1f26a5666064510862104151c94 (diff) | |
| download | ceph-e958efa29aebfb89b0d5e7fa0fbadc0bf241a7ca.tar.gz | |
new default keyring location for daemons
$osd_data/keyring
$mds_data/keyring
Fixes: #2498
Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/common_init.cc | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/common/common_init.cc b/src/common/common_init.cc index 2e69d771fe7..963b61573d0 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: |