]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson: set default keyring path
authorKefu Chai <kchai@redhat.com>
Thu, 10 Jan 2019 13:12:25 +0000 (21:12 +0800)
committerKefu Chai <kchai@redhat.com>
Fri, 18 Jan 2019 04:32:21 +0000 (12:32 +0800)
otherwise crimson-osd won't be able to load the keyring

Signed-off-by: Kefu Chai <kchai@redhat.com>
src/crimson/common/config_proxy.cc

index f1879090673d828a33566f55a9e6bf64421bcc4c..720fcffddae607235bb09b32e970974efd99a536 100644 (file)
@@ -15,6 +15,13 @@ ConfigProxy::ConfigProxy(const EntityName& name, std::string_view cluster)
   values.get()->cluster = cluster;
   // and the only copy of md_config_impl<> is allocated on CPU#0
   local_config.reset(new md_config_t{*values, obs_mgr, true});
+  if (name.is_mds()) {
+    local_config->set_val_default(*values, obs_mgr,
+                                 "keyring", "$mds_data/keyring");
+  } else if (name.is_osd()) {
+    local_config->set_val_default(*values, obs_mgr,
+                                 "keyring", "$osd_data/keyring");
+  }
 }
 
 seastar::future<> ConfigProxy::start()