From: Sage Weil <sage@redhat.com>
Date: Fri, 11 Jan 2019 15:00:05 +0000 (-0600)
Subject: common/options: add FLAG_MINIMAL_CONF
X-Git-Tag: v14.1.0~388^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=320c154618eb50bb7681ca0ad6169679546d2ceb;p=ceph.git

common/options: add FLAG_MINIMAL_CONF

Mark a few auth options that would go in ceph.conf.

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

diff --git a/src/common/options.cc b/src/common/options.cc
index 1b9d69c0a20b..48583ad4bc03 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -1998,19 +1998,20 @@ std::vector<Option> get_global_options() {
 
     Option("auth_cluster_required", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("cephx")
-    .set_description(""),
+    .set_description("authentication methods required by the cluster"),
 
     Option("auth_service_required", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("cephx")
-    .set_description(""),
+    .set_description("authentication methods required by service daemons"),
 
     Option("auth_client_required", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("cephx, none")
-    .set_description(""),
+    .set_flag(Option::FLAG_MINIMAL_CONF)
+    .set_description("authentication methods allowed by clients"),
 
     Option("auth_supported", Option::TYPE_STR, Option::LEVEL_ADVANCED)
     .set_default("")
-    .set_description(""),
+    .set_description("authentication methods required (deprecated)"),
 
     Option("max_rotating_auth_attempts", Option::TYPE_INT, Option::LEVEL_ADVANCED)
     .set_default(10)
diff --git a/src/common/options.h b/src/common/options.h
index 60b5fd7ac35f..3f1cc4c94652 100644
--- a/src/common/options.h
+++ b/src/common/options.h
@@ -117,6 +117,7 @@ struct Option {
     FLAG_CLUSTER_CREATE = 0x8,  ///< option only has effect at cluster creation
     FLAG_CREATE = 0x10,         ///< option only has effect at daemon creation
     FLAG_MGR = 0x20,            ///< option is a mgr module option
+    FLAG_MINIMAL_CONF = 0x40,   ///< option should go in a minimal ceph.conf
   };
 
   struct size_t {