From: Sage Weil <sage@redhat.com>
Date: Wed, 31 Jan 2018 23:40:53 +0000 (-0600)
Subject: global/global_init: apply_changes() for config fetch session
X-Git-Tag: wip-pdonnell-testing-20180317.202121~121^2~29
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=6877b3bd269f6faa96371a488a5c2b1887a20187;p=ceph-ci.git

global/global_init: apply_changes() for config fetch session

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

diff --git a/src/global/global_init.cc b/src/global/global_init.cc
index dac8421a027..a7b103da499 100644
--- a/src/global/global_init.cc
+++ b/src/global/global_init.cc
@@ -142,6 +142,9 @@ void global_pre_init(
   conf->parse_argv(args);
 
   if (!conf->no_mon_config) {
+    // make sure our mini-session gets legacy values
+    conf->apply_changes(nullptr);
+
     MonClient mc_bootstrap(g_ceph_context);
     if (mc_bootstrap.get_monmap_and_config() < 0) {
       derr << "failed to fetch mon config (--no-mon-config to skip)" << dendl;