crimson/osd: fetch configuration from monitors conditionally.

Before this change we were always attempting to fetch the config
from monitors, even if `--no-mon-config` had been passed. This
was the reason for failures at teuthology like:
http://pulpito.front.sepia.ceph.com/rzarzynski-2021-02-15_21:09:02-rados-master-distro-basic-smithi/5885250

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

diff --git a/src/crimson/osd/main.cc b/src/crimson/osd/main.cc
index 21654cddd1b7fc3ab8202f6769192a1ac5e3956d..d4e72c29c1ec7825eda41fff3b77b7095effa93e 100644 (file)
--- a/src/crimson/osd/main.cc
+++ b/src/crimson/osd/main.cc
@@ -173,7 +173,8 @@ int main(int argc, char* argv[])
     ("mkkey", "generate a new secret key. "
               "This is normally used in combination with --mkfs")
     ("mkfs", "create a [new] data directory")
-    ("debug", "enable debug output on all loggers");
+    ("debug", "enable debug output on all loggers")
+    ("no-mon-config", "do not retrieve configuration from monitors on boot");
 
   auto [ceph_args, app_args] = partition_args(app, argv, argv + argc);
   if (ceph_argparse_need_usage(ceph_args) &&
@@ -242,7 +243,9 @@ int main(int argc, char* argv[])
             seastar::engine().exit(1);
           }).get();
         }
-        fetch_config().get();
+        if (config.count("no-mon-config") == 0) {
+          fetch_config().get();
+        }
         if (config.count("mkfs")) {
           osd.invoke_on(
            0,