From: Sage Weil <sage@redhat.com>
Date: Fri, 19 Jul 2019 18:11:03 +0000 (-0500)
Subject: common/options: make clients prefer to connect to mons via secure mode
X-Git-Tag: v14.2.3~126^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2d3c8e3063bcb2e2e35fd61f834f0eac69f236c9;p=ceph.git

common/options: make clients prefer to connect to mons via secure mode

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit cd4b4f01b9b46587fc7f3ce65e956213af18f300)

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

diff --git a/src/common/options.cc b/src/common/options.cc
index 2d4149c4de53..920477a6c756 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -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")