From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 9 May 2018 16:37:22 +0000 (-0400)
Subject: rbd: don't load config overrides from monitor initially
X-Git-Tag: v13.1.1~37^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a74c93f19ceb412738a0c3a65bac976f4d28a2af;p=ceph.git

rbd: don't load config overrides from monitor initially

The overrides will be loaded when we connect to the cluster via librados
and the current approach prevents running 'rbd help' without a running
cluster.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 46eafdabde57736d2a8b63f55cab94461885a957)
---

diff --git a/src/tools/rbd/Shell.cc b/src/tools/rbd/Shell.cc
index cbe21b117370..ee724f1a3f7f 100644
--- a/src/tools/rbd/Shell.cc
+++ b/src/tools/rbd/Shell.cc
@@ -32,7 +32,8 @@ boost::intrusive_ptr<CephContext> global_init(
   argv_to_vec(argc, argv, cmd_args);
   std::vector<const char*> args(cmd_args);
   auto cct = global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT,
-                         CODE_ENVIRONMENT_UTILITY, 0);
+                         CODE_ENVIRONMENT_UTILITY,
+                         CINIT_FLAG_NO_MON_CONFIG);
 
   *command_args = {args.begin(), args.end()};