From: David Zafman <dzafman@redhat.com>
Date: Tue, 7 Oct 2014 01:26:44 +0000 (-0700)
Subject: ceph_objectstore_tool: Accept CEPH_ARGS environment arguments
X-Git-Tag: v0.80.10~69^2~55
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e0dab883d29bd3a54b5707f8d3ea830f8a1ce516;p=ceph.git

ceph_objectstore_tool: Accept CEPH_ARGS environment arguments

Signed-off-by: David Zafman <dzafman@redhat.com>
(cherry picked from commit 10fe7cfe561f91717f2ac2e13aeecc06a903704e)
---

diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc
index ce7c889acb1b..ea4411cd1517 100644
--- a/src/tools/ceph_objectstore_tool.cc
+++ b/src/tools/ceph_objectstore_tool.cc
@@ -19,6 +19,7 @@
 
 #include "common/Formatter.h"
 #include "common/errno.h"
+#include "common/ceph_argparse.h"
 
 #include "global/global_init.h"
 
@@ -1976,10 +1977,11 @@ int main(int argc, char **argv)
     return 1;
   }
 
-  vector<const char *> ceph_options, def_args;
+  vector<const char *> ceph_options;
+  env_to_vec(ceph_options);
   vector<string> ceph_option_strings = po::collect_unrecognized(
     parsed.options, po::include_positional);
-  ceph_options.reserve(ceph_option_strings.size());
+  ceph_options.reserve(ceph_options.size() + ceph_option_strings.size());
   for (vector<string>::iterator i = ceph_option_strings.begin();
        i != ceph_option_strings.end();
        ++i) {
@@ -1993,7 +1995,7 @@ int main(int argc, char **argv)
     flags |= SKIP_MOUNT_OMAP;
 
   global_init(
-    &def_args, ceph_options, CEPH_ENTITY_TYPE_OSD,
+    NULL, ceph_options, CEPH_ENTITY_TYPE_OSD,
     CODE_ENVIRONMENT_UTILITY_NODOUT, 0);
     //CINIT_FLAG_NO_DEFAULT_CONFIG_FILE);
   common_init_finish(g_ceph_context);