From: Sage Weil <sage@redhat.com>
Date: Wed, 10 Jan 2018 18:29:14 +0000 (-0600)
Subject: common/options: drop 'safe' flag on plugin dir options
X-Git-Tag: v13.0.2~78^2~67
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b3658c8196a0dc7a5c7668944ef9094224fd3ce2;p=ceph.git

common/options: drop 'safe' flag on plugin dir options

These were only marked safe to accomodate the unit test CEPH_LIB hackery,
which is now removed.

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

diff --git a/src/common/options.cc b/src/common/options.cc
index cd76c494984..837c6e1d9dd 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -451,8 +451,7 @@ std::vector<Option> get_global_options() {
     Option("erasure_code_dir", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default(CEPH_PKGLIBDIR"/erasure-code")
     .set_description("directory where erasure-code plugins can be found")
-    .add_service({"mon", "osd"})
-    .set_safe(),
+    .add_service({"mon", "osd"}),
 
     // logging
     Option("log_file", Option::TYPE_STR, Option::LEVEL_BASIC)
@@ -615,8 +614,7 @@ std::vector<Option> get_global_options() {
 
     Option("plugin_dir", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default(CEPH_PKGLIBDIR)
-    .set_description("")
-    .set_safe(),
+    .set_description(""),
 
     Option("xio_trace_mempool", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
     .set_default(false)