Merge PR ceph#27012 into master

* refs/pull/27012/head: common/options: allow (but to not prefer or require) secure mode common/options: make clients prefer to connect to mons via secure mode common/options: allow connections to mons in secure mode common/options: prefer secure mode between monitors auth/AuthRegistry: remove experimental flag for 'secure' mode Reviewed-by: Neha Ojha <[email protected]> Reviewed-by: Greg Farnum <[email protected]>
chriszl · Mar 28, 2019 · 3326f0b · 3326f0b
2 parents 9de36ff + 1aa28cd
commit 3326f0b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/auth/AuthRegistry.cc b/src/auth/AuthRegistry.cc
@@ -99,9 +99,7 @@ void AuthRegistry::_parse_mode_list(const string& s,
     if (i == "crc") {
       v->push_back(CEPH_CON_MODE_CRC);
     } else if (i == "secure") {
-      if (cct->check_experimental_feature_enabled("ms-mode-secure")) {
-	v->push_back(CEPH_CON_MODE_SECURE);
-      }
+      v->push_back(CEPH_CON_MODE_SECURE);
     } else {
       lderr(cct) << "WARNING: unknown connection mode " << i << dendl;
     }

diff --git a/src/common/options.cc b/src/common/options.cc
@@ -790,7 +790,7 @@ std::vector<Option> get_global_options() {
     .add_see_also("ms_type"),
 
     Option("ms_mon_cluster_mode", Option::TYPE_STR, Option::LEVEL_BASIC)
-    .set_default("crc")
+    .set_default("secure crc")
     .set_description("Connection modes (crc, secure) for intra-mon connections in order of preference")
     .add_see_also("ms_mon_service_mode")
     .add_see_also("ms_mon_client_mode")
@@ -799,7 +799,7 @@ std::vector<Option> get_global_options() {
     .add_see_also("ms_client_mode"),
 
     Option("ms_mon_service_mode", Option::TYPE_STR, Option::LEVEL_BASIC)
-    .set_default("crc")
+    .set_default("secure crc")
     .set_description("Allowed connection modes (crc, secure) for connections to mons")
     .add_see_also("ms_service_mode")
     .add_see_also("ms_mon_cluster_mode")
@@ -808,7 +808,7 @@ std::vector<Option> get_global_options() {
     .add_see_also("ms_client_mode"),
 
     Option("ms_mon_client_mode", Option::TYPE_STR, Option::LEVEL_BASIC)
-    .set_default("crc")
+    .set_default("secure crc")
     .set_description("Connection modes (crc, secure) for connections from clients to monitors in order of preference")
     .add_see_also("ms_mon_service_mode")
     .add_see_also("ms_mon_cluster_mode")
@@ -817,19 +817,19 @@ std::vector<Option> get_global_options() {
     .add_see_also("ms_client_mode"),
 
     Option("ms_cluster_mode", Option::TYPE_STR, Option::LEVEL_BASIC)
-    .set_default("crc")
+    .set_default("crc secure")
     .set_description("Connection modes (crc, secure) for intra-cluster connections in order of preference")
     .add_see_also("ms_service_mode")
     .add_see_also("ms_client_mode"),
 
     Option("ms_service_mode", Option::TYPE_STR, Option::LEVEL_BASIC)
-    .set_default("crc")
+    .set_default("crc secure")
     .set_description("Allowed connection modes (crc, secure) for connections to daemons")
     .add_see_also("ms_cluster_mode")
     .add_see_also("ms_client_mode"),
 
     Option("ms_client_mode", Option::TYPE_STR, Option::LEVEL_BASIC)
-    .set_default("crc")
+    .set_default("crc secure")
     .set_description("Connection modes (crc, secure) for connections from clients in order of preference")
     .add_see_also("ms_cluster_mode")
     .add_see_also("ms_service_mode"),