From: Sage Weil <sage@redhat.com>
Date: Tue, 26 Jan 2016 21:06:35 +0000 (-0500)
Subject: common: add $data_dir/config to config search path
X-Git-Tag: v10.0.4~29^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=78592fd8a2edd45aec16b18c5859fd5f877f2b0a;p=ceph.git

common: add $data_dir/config to config search path

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

diff --git a/src/common/config.cc b/src/common/config.cc
index 7ffaf0494b0e..d67a96bb3b20 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 = {