mon,option: set default value for mon_dns_srv_name

Fixes: http://tracker.ceph.com/issues/21204
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit 50207769f0c187cc8caf2bed3a1c94df409718e5)

diff --git a/src/common/legacy_config_opts.h b/src/common/legacy_config_opts.h
index cb6b406bb12ec1d870787c376969450b57ab449e..89de9a82f2665b2456fcbfcc1535b1713b5379d3 100644 (file)
--- a/src/common/legacy_config_opts.h
+++ b/src/common/legacy_config_opts.h
@@ -22,7 +22,6 @@ OPTION(public_network, OPT_STR)
 OPTION(cluster_network, OPT_STR)
 OPTION(monmap, OPT_STR)
 OPTION(mon_host, OPT_STR)
-OPTION(mon_dns_srv_name, OPT_STR)
 OPTION(lockdep, OPT_BOOL)
 OPTION(lockdep_force_backtrace, OPT_BOOL) // always gather current backtrace at every lock
 OPTION(run_dir, OPT_STR)       // the "/var/run/ceph" dir, created on daemon startup

diff --git a/src/common/options.cc b/src/common/options.cc
index 08ac1d39f513c08b77392365ddf4132cfbf0c1bb..8af4fbe77dd9b1083d1440e8ee84ca706a18facd 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -183,6 +183,7 @@ std::vector<Option> get_global_options() {
     .add_service("common"),
 
     Option("mon_dns_srv_name", Option::TYPE_STR, Option::LEVEL_ADVANCED)
+    .set_default("ceph-mon")
     .set_description("name of DNS SRV record to check for monitor addresses")
     .add_service("common")
     .add_tag("network")

diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc
index 218df9aa843df7d5c838fd66645a00489f881ded..67381bd430a8dff4890e34dd3c55be84c7021b31 100644 (file)
--- a/src/mon/MonMap.cc
+++ b/src/mon/MonMap.cc
@@ -536,7 +536,7 @@ int MonMap::build_initial(CephContext *cct, ostream& errout)
 
   if (size() == 0) {
     // no info found from conf options lets try use DNS SRV records
-    string srv_name = conf->mon_dns_srv_name;
+    string srv_name = conf->get_val<std::string>("mon_dns_srv_name");
     string domain;
     // check if domain is also provided and extract it from srv_name
     size_t idx = srv_name.find("_");