RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-01 08:32:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

common/options: add FLAG_MINIMAL_CONF

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

Signed-off-by: Sage Weil <sage@redhat.com>
This commit is contained in:
Sage Weil 2019-01-11 09:00:05 -06:00
parent 5dfcb551ff
commit 320c154618
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/common/options.cc
View File

@ -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)

1
src/common/options.h
View File

@ -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 {