summaryrefslogtreecommitdiffstats
path: root/src/common/config.cc
diff options
context:
space:
mode:
authorSage Weil <sage@redhat.com>2016-01-26 22:06:35 +0100
committerSage Weil <sage@redhat.com>2016-02-04 23:06:02 +0100
commit78592fd8a2edd45aec16b18c5859fd5f877f2b0a (patch)
treefaa829bc2832d6008b1412be78a54ad9e744f88c /src/common/config.cc
parentcommon/config: expand $data_dir in config path (diff)
downloadceph-78592fd8a2edd45aec16b18c5859fd5f877f2b0a.tar.xz
ceph-78592fd8a2edd45aec16b18c5859fd5f877f2b0a.zip
common: add $data_dir/config to config search path
Signed-off-by: Sage Weil <sage@redhat.com>
Diffstat (limited to '')
-rw-r--r--src/common/config.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/config.cc b/src/common/config.cc
index 7ffaf0494b0..d67a96bb3b2 100644
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -56,7 +56,7 @@ using std::pair;
using std::set;
using std::string;
-const char *CEPH_CONF_FILE_DEFAULT = "/etc/ceph/$cluster.conf, ~/.ceph/$cluster.conf, $cluster.conf";
+const char *CEPH_CONF_FILE_DEFAULT = "$data_dir/config, /etc/ceph/$cluster.conf, ~/.ceph/$cluster.conf, $cluster.conf";
// file layouts
struct ceph_file_layout g_default_file_layout = {