]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rbd-ggate: honor rbd_default_pool config setting
authorMykola Golub <to.my.trociny@gmail.com>
Mon, 25 Dec 2017 09:11:24 +0000 (09:11 +0000)
committerMykola Golub <to.my.trociny@gmail.com>
Mon, 25 Dec 2017 11:05:12 +0000 (11:05 +0000)
Signed-off-by: Mykola Golub <to.my.trociny@gmail.com>
src/tools/rbd_ggate/main.cc

index 1a0e3140c2642c0a9bf3a4c35babf3c843ee8211..4cb4053dc518189c1435d0f8bb6754b1199514b6 100644 (file)
@@ -47,7 +47,7 @@ static void usage() {
   generic_server_usage();
 }
 
-static std::string devpath, poolname("rbd"), imgname, snapname;
+static std::string devpath, poolname, imgname, snapname;
 static bool readonly = false;
 static bool exclusive = false;
 
@@ -106,6 +106,10 @@ static int do_map(int argc, const char *argv[])
   common_init_finish(g_ceph_context);
   global_init_chdir(g_ceph_context);
 
+  if (poolname.empty()) {
+    poolname = g_ceph_context->_conf->get_val<std::string>("rbd_default_pool");
+  }
+
   std::string devname = (devpath.compare(0, 5, "/dev/") == 0) ?
     devpath.substr(5) : devpath;
   std::unique_ptr<rbd::ggate::Watcher> watcher;