From: Tommi Virtanen Date: Thu, 30 Aug 2012 14:21:29 +0000 (-0400) Subject: config: Add a per-name default keyring to front of keyring search path. X-Git-Tag: v0.53~240 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=3b0e2a2d98489e023cfe6d9253149c3c7cfb1a68;p=ceph.git 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. --- diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 292507e0a3f37..2ad3b0a23cadb 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -86,7 +86,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)