From: Sage Weil <sage@redhat.com>
Date: Fri, 19 Jul 2019 18:11:39 +0000 (-0500)
Subject: common/options: allow (but to not prefer or require) secure mode
X-Git-Tag: v14.2.3~126^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F29143%2Fhead;p=ceph.git

common/options: allow (but to not prefer or require) secure mode

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

# Conflicts:
#	src/common/options.cc
- STARTUP flag backport ordering
---

diff --git a/src/common/options.cc b/src/common/options.cc
index 920477a6c756..c3cf4776e03d 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -935,21 +935,21 @@ std::vector<Option> get_global_options() {
     .add_see_also("ms_client_mode"),
 
     Option("ms_cluster_mode", Option::TYPE_STR, Option::LEVEL_BASIC)
-    .set_default("crc")
+    .set_default("crc secure")
     .set_flag(Option::FLAG_STARTUP)
     .set_description("Connection modes (crc, secure) for intra-cluster connections in order of preference")
     .add_see_also("ms_service_mode")
     .add_see_also("ms_client_mode"),
 
     Option("ms_service_mode", Option::TYPE_STR, Option::LEVEL_BASIC)
-    .set_default("crc")
+    .set_default("crc secure")
     .set_flag(Option::FLAG_STARTUP)
     .set_description("Allowed connection modes (crc, secure) for connections to daemons")
     .add_see_also("ms_cluster_mode")
     .add_see_also("ms_client_mode"),
 
     Option("ms_client_mode", Option::TYPE_STR, Option::LEVEL_BASIC)
-    .set_default("crc")
+    .set_default("crc secure")
     .set_flag(Option::FLAG_STARTUP)
     .set_description("Connection modes (crc, secure) for connections from clients in order of preference")
     .add_see_also("ms_cluster_mode")