]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
rbd: don't load config overrides from monitor initially
authorJason Dillaman <dillaman@redhat.com>
Wed, 9 May 2018 16:37:22 +0000 (12:37 -0400)
committerJason Dillaman <dillaman@redhat.com>
Thu, 10 May 2018 11:44:44 +0000 (07:44 -0400)
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)

src/tools/rbd/Shell.cc

index cbe21b117370bcc781ebf5fdba222aa5bd42bba9..ee724f1a3f7fe4fbbd31f584a146b96eb3f7e4e0 100644 (file)
@@ -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()};