common/config: export CEPH_CONF_FILE_DEFAULT

It used to be exported until commit 318c62f8ae16 ("common/config:
cleanup remove some unused macros").  Having CEPH_CONF_FILE_DEFAULT
avaialable is handy to prevent parse_config_files() from picking up
CEPH_CONF environment variable.

Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
(cherry picked from commit 57a8c535ccad35a9f6e11e8976bc32f390ad341c)

diff --git a/src/common/config.cc b/src/common/config.cc
index 604b3c35d5e32912d23646f140c94ea6337f73ba..e151e94bb90fdbf418a5b3643df305ad182acd3f 100644 (file)
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -55,7 +55,7 @@ using ceph::decode;
 using ceph::encode;
 using ceph::Formatter;
 
-static const char *CEPH_CONF_FILE_DEFAULT = "$data_dir/config,/etc/ceph/$cluster.conf,$home/.ceph/$cluster.conf,$cluster.conf"
+const char *CEPH_CONF_FILE_DEFAULT = "$data_dir/config,/etc/ceph/$cluster.conf,$home/.ceph/$cluster.conf,$cluster.conf"
 #if defined(__FreeBSD__)
     ",/usr/local/etc/ceph/$cluster.conf"
 #elif defined(_WIN32)

diff --git a/src/common/config.h b/src/common/config.h
index ff7bc20f613df267cf91c6b3a977684b70a0b665..3e7b51d987d259ef2a5d2c091c37e706950c0978 100644 (file)
--- a/src/common/config.h
+++ b/src/common/config.h
@@ -39,6 +39,8 @@ enum {
 
 extern const char *ceph_conf_level_name(int level);
 
+extern const char *CEPH_CONF_FILE_DEFAULT;
+
 /** This class represents the current Ceph configuration.
  *
  * For Ceph daemons, this is the daemon configuration.  Log levels, caching