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

common/options: prefer secure mode between monitors

We still allow crc here in order to facilitate upgrades.

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

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

diff --git a/src/common/options.cc b/src/common/options.cc
index 9c79197cf93d..a3e634d8c71c 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -905,7 +905,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_flag(Option::FLAG_STARTUP)
     .set_description("Connection modes (crc, secure) for intra-mon connections in order of preference")
     .add_see_also("ms_mon_service_mode")