From: Sage Weil <sage@redhat.com>
Date: Fri, 19 Jul 2019 18:10:41 +0000 (-0500)
Subject: common/options: allow connections to mons in secure mode
X-Git-Tag: v14.2.3~126^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd0f46d1a5c212e94b014ca588bcd91000df296e;p=ceph.git

common/options: allow connections to mons in secure mode

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

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

diff --git a/src/common/options.cc b/src/common/options.cc
index a3e634d8c71c..2d4149c4de53 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -915,7 +915,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_flag(Option::FLAG_STARTUP)
     .set_description("Allowed connection modes (crc, secure) for connections to mons")
     .add_see_also("ms_service_mode")