common/config: tweak order of env parsing

CEPH_ARGS is half-way between env and cmdline; parse it at the end of
env.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/config.cc b/src/common/config.cc
index d0eefe66b5c0ad73d220abff09c1e25dd0ed8c1e..1bbcfb463e173eda367cb774d01a2534601de646 100644 (file)
--- a/src/common/config.cc
+++ b/src/common/config.cc
@@ -469,11 +469,6 @@ void md_config_t::parse_env(const char *args_var)
     string k = getenv("CEPH_KEYRING");
     values["keyring"][CONF_ENV] = Option::value_t(k);
   }
-  if (getenv(args_var)) {
-    vector<const char *> env_args;
-    env_to_vec(env_args, args_var);
-    parse_argv(env_args, CONF_ENV);
-  }
   if (const char *dir = getenv("CEPH_LIB")) {
     Mutex::Locker l(lock);
     for (auto name : { "erasure_code_dir", "plugin_dir", "osd_class_dir" }) {
@@ -483,6 +478,11 @@ void md_config_t::parse_env(const char *args_var)
       _set_val(dir, *o, CONF_ENV, &err);
     }
   }
+  if (getenv(args_var)) {
+    vector<const char *> env_args;
+    env_to_vec(env_args, args_var);
+    parse_argv(env_args, CONF_ENV);
+  }
 }
 
 void md_config_t::show_config(std::ostream& out)