rgw: default keyring to $rgw_data/keyring

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

diff --git a/src/common/config_opts.h b/src/common/config_opts.h
index 1da6d28e460edcb64d50439c6629b4829f7da47f..c64f8a510594a18dff22326634ab1944f93e36a1 100644 (file)
--- a/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@ -387,6 +387,7 @@ OPTION(rbd_cache_size, OPT_LONGLONG, 32<<20)         // cache size in bytes
 OPTION(rbd_cache_max_dirty, OPT_LONGLONG, 24<<20)    // dirty limit in bytes - set to 0 for write-through caching
 OPTION(rbd_cache_target_dirty, OPT_LONGLONG, 16<<20) // target dirty limit in bytes
 OPTION(rbd_cache_max_dirty_age, OPT_FLOAT, 1.0)      // seconds in cache before writeback starts
+OPTION(rgw_data, OPT_STR, "/var/lib/ceph/radosgw/$cluster-$id")
 OPTION(rgw_cache_enabled, OPT_BOOL, true)   // rgw cache enabled
 OPTION(rgw_cache_lru_size, OPT_INT, 10000)   // num of entries in rgw cache
 OPTION(rgw_socket_path, OPT_STR, "")   // path to unix domain socket, if not specified, rgw will not run as external fcgi

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 58ee40328cc079696570a12d9a0de9ce33f0703f..3c29de420626de1f1e3c44bccf45ab42a8b26392 100644 (file)
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -359,6 +359,7 @@ int main(int argc, const char **argv)
   /* alternative default for module */
   vector<const char *> def_args;
   def_args.push_back("--debug-rgw=20");
+  def_args.push_back("--keyring=$rgw_data/keyring");
 
   vector<const char*> args;
   argv_to_vec(argc, argv, args);