]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
common/options: make clients prefer to connect to mons via secure mode
authorSage Weil <sage@redhat.com>
Fri, 19 Jul 2019 18:11:03 +0000 (13:11 -0500)
committerSage Weil <sage@redhat.com>
Fri, 19 Jul 2019 18:11:03 +0000 (13:11 -0500)
Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit cd4b4f01b9b46587fc7f3ce65e956213af18f300)

# Conflicts:
# src/common/options.cc
- STARTUP flag was already backported

src/common/options.cc

index 2d4149c4de53795f993e3868e1e4341d5d1d1633..920477a6c756154234c7c5aeae690e0a61fb63bb 100644 (file)
@@ -925,7 +925,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_flag(Option::FLAG_STARTUP)
     .set_description("Connection modes (crc, secure) for connections from clients to monitors in order of preference")
     .add_see_also("ms_mon_service_mode")