From 10fe7cfe561f91717f2ac2e13aeecc06a903704e Mon Sep 17 00:00:00 2001 From: David Zafman Date: Mon, 6 Oct 2014 18:26:44 -0700 Subject: [PATCH] ceph_objectstore_tool: Accept CEPH_ARGS environment arguments Signed-off-by: David Zafman --- src/tools/ceph_objectstore_tool.cc | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc index abb1a988f5a0..288e9cb14a17 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" @@ -1978,10 +1979,11 @@ int main(int argc, char **argv) return 1; } - vector ceph_options, def_args; + vector ceph_options; + env_to_vec(ceph_options); vector 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::iterator i = ceph_option_strings.begin(); i != ceph_option_strings.end(); ++i) { @@ -1995,7 +1997,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); -- 2.47.3