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 a3e634d8c71cd98f5d8f89db8c29282c36f75fad..2d4149c4de53795f993e3868e1e4341d5d1d1633 100644 (file)
--- 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")