From: Sage Weil <sage@redhat.com>
Date: Sat, 16 Mar 2019 20:55:01 +0000 (-0500)
Subject: auth/AuthRegistry: remove experimental flag for 'secure' mode
X-Git-Tag: v14.2.3~126^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2c39190fabd352e9ebfd138be4b4037ba64af2e2;p=ceph.git

auth/AuthRegistry: remove experimental flag for 'secure' mode

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

diff --git a/src/auth/AuthRegistry.cc b/src/auth/AuthRegistry.cc
index 64ccd60d99ef..241db4a9c733 100644
--- a/src/auth/AuthRegistry.cc
+++ b/src/auth/AuthRegistry.cc
@@ -99,9 +99,7 @@ void AuthRegistry::_parse_mode_list(const string& s,
     if (i == "crc") {
       v->push_back(CEPH_CON_MODE_CRC);
     } else if (i == "secure") {
-      if (cct->check_experimental_feature_enabled("ms-mode-secure")) {
-	v->push_back(CEPH_CON_MODE_SECURE);
-      }
+      v->push_back(CEPH_CON_MODE_SECURE);
     } else {
       lderr(cct) << "WARNING: unknown connection mode " << i << dendl;
     }