From: Sage Weil <sage@redhat.com>
Date: Sat, 16 Mar 2019 20:58:05 +0000 (-0500)
Subject: common/options: prefer secure mode between monitors
X-Git-Tag: v15.0.0~53^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a39273b79430cc0683b29fb7550cdbf18c760d98;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>
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 8e2f94bfca41..02a52565e70e 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -841,7 +841,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")