From: Sage Weil <sage@newdream.net>
Date: Mon, 2 Aug 2021 15:31:32 +0000 (-0500)
Subject: rgw: default ms_mon_client_mode = secure
X-Git-Tag: v16.2.8~95^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=5943bb5a94bb37429bf3c1bb9f15d69ad636002d;p=ceph.git

rgw: default ms_mon_client_mode = secure

Require a secure connection to the monitor.  This is important because
we may store SSL certs on the mon.

Note that secure mode was introduce before Nautilus, so this can be
backported at least to Pacific.

Fixes: https://tracker.ceph.com/issues/52000
Signed-off-by: Sage Weil <sage@newdream.net>
(cherry picked from commit 7e22d2a31d277ab3eecff47b0864b206a32e2332)
---

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 2345a5dbea9..3d1a992e9e7 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -195,7 +195,8 @@ int radosgw_Main(int argc, const char **argv)
   map<string,string> defaults = {
     { "debug_rgw", "1/5" },
     { "keyring", "$rgw_data/keyring" },
-    { "objecter_inflight_ops", "24576" }
+    { "objecter_inflight_ops", "24576" },
+    { "ms_mon_client_mode", "secure" }
   };
 
   vector<const char*> args;