diff options
| author | Jason Dillaman <dillaman@redhat.com> | 2018-05-09 18:37:22 +0200 |
|---|---|---|
| committer | Jason Dillaman <dillaman@redhat.com> | 2018-05-10 13:44:44 +0200 |
| commit | a74c93f19ceb412738a0c3a65bac976f4d28a2af (patch) | |
| tree | 2be52c6b65912d687888f2d3b73f8a04203c7d4e /src/tools/rbd/Shell.cc | |
| parent | rbd-mirror: ensure remote demotion is replayed locally (diff) | |
| download | ceph-a74c93f19ceb412738a0c3a65bac976f4d28a2af.tar.xz ceph-a74c93f19ceb412738a0c3a65bac976f4d28a2af.zip | |
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)
Diffstat (limited to '')
| -rw-r--r-- | src/tools/rbd/Shell.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/rbd/Shell.cc b/src/tools/rbd/Shell.cc index cbe21b11737..ee724f1a3f7 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()}; |