From: Willem Jan Withagen Date: Thu, 27 Apr 2017 13:58:36 +0000 (+0200) Subject: common/config_opts.h: Allow for /usr/local/etc/ceph to hold keyrings X-Git-Tag: v12.0.3~211^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bcc644593c284afa04a9fc0e9470c0073f36737c;p=ceph-ci.git common/config_opts.h: Allow for /usr/local/etc/ceph to hold keyrings Signed-off-by: Willem Jan Withagen --- diff --git a/src/common/config_opts.h b/src/common/config_opts.h index 0f88ad3339d..afbd70d645a 100644 --- a/src/common/config_opts.h +++ b/src/common/config_opts.h @@ -172,7 +172,14 @@ SUBSYS(eventtrace, 1, 5) OPTION(key, OPT_STR, "") OPTION(keyfile, OPT_STR, "") -OPTION(keyring, OPT_STR, "/etc/ceph/$cluster.$name.keyring,/etc/ceph/$cluster.keyring,/etc/ceph/keyring,/etc/ceph/keyring.bin") // default changed by common_preinit() for mds and osd +OPTION(keyring, OPT_STR, + // default changed by common_preinit() for mds and osd + "/etc/ceph/$cluster.$name.keyring,/etc/ceph/$cluster.keyring,/etc/ceph/keyring,/etc/ceph/keyring.bin," +#if defined(__FreeBSD) + "/usr/local/etc/ceph/$cluster.$name.keyring,/usr/local/etc/ceph/$cluster.keyring," + "/usr/local/etc/ceph/keyring,/usr/local/etc/ceph/keyring.bin," +#endif + ) OPTION(heartbeat_interval, OPT_INT, 5) OPTION(heartbeat_file, OPT_STR, "") OPTION(heartbeat_inject_failure, OPT_INT, 0) // force an unhealthy heartbeat for N seconds