From 66aecb1e410a59f3e0ed89a30212b8dc546a3d4a Mon Sep 17 00:00:00 2001 From: Tommi Virtanen Date: Thu, 30 Aug 2012 10:21:29 -0400 Subject: [PATCH] config: Add a per-name default keyring to front of keyring search path. This lets us have e.g. /etc/ceph/ceph.client.admin.keyring that is owned by root:admin and mode u=rw,g=r,o= without making every non-root run of the command line tools complain and fail. This is what the Chef cookbook has been doing for a while already. Signed-off-by: Tommi Virtanen --- src/common/config_opts.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/config_opts.h b/src/common/config_opts.h index a943584804cd7..c6dccaa3332e3 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -85,7 +85,7 @@ SUBSYS(throttle, 1, 5) OPTION(key, OPT_STR, "") OPTION(keyfile, OPT_STR, "") -OPTION(keyring, OPT_STR, "/etc/ceph/$cluster.keyring,/etc/ceph/keyring,/etc/ceph/keyring.bin") +OPTION(keyring, OPT_STR, "/etc/ceph/$cluster.$name.keyring,/etc/ceph/$cluster.keyring,/etc/ceph/keyring,/etc/ceph/keyring.bin") OPTION(heartbeat_interval, OPT_INT, 5) OPTION(heartbeat_file, OPT_STR, "") OPTION(ms_tcp_nodelay, OPT_BOOL, true) -- 2.39.5