common/options: remove auth_supported

Signed-off-by: Patrick Donnelly <pdonnell@ibm.com>

diff --git a/PendingReleaseNotes b/PendingReleaseNotes
index 446297dad6179e1a3f8f3e387069f606ca6bd150..a421968a42458d9c3240edc47dc6b9b80a4e5835 100644 (file)
--- a/PendingReleaseNotes
+++ b/PendingReleaseNotes
@@ -17,6 +17,9 @@
   and the scrubbing process is delayed between each read in order to avoid monopolizing
   the I/O capacity of the OSD.
   The default stride size (``osd_deep_scrub_stride``) was 512 KBytes, and is now 4 MBytes.
+>=21.0.0
+
+* The ``auth_supported`` config has been removed.
 
 * CephFS: The offline CephFS tools (cephfs-data-scan, cephfs-journal-tool,
   and cephfs-table-tool) now include progress tracking with ETA (Estimated Time of

diff --git a/src/auth/AuthRegistry.cc b/src/auth/AuthRegistry.cc
index ceeabaec61ff66a76a93ae7729bc86f6cd90f2d2..3ee71842b685191db37f7229eba6fb75bf10f7bc 100644 (file)
--- a/src/auth/AuthRegistry.cc
+++ b/src/auth/AuthRegistry.cc
@@ -36,7 +36,6 @@ AuthRegistry::~AuthRegistry()
 std::vector<std::string> AuthRegistry::get_tracked_keys() const noexcept
 {
   return {
-    "auth_supported"s,
     "auth_client_required"s,
     "auth_cluster_required"s,
     "auth_service_required"s,
@@ -113,15 +112,20 @@ void AuthRegistry::_parse_mode_list(const string& s,
 
 void AuthRegistry::_refresh_config()
 {
-  if (cct->_conf->auth_supported.size()) {
-    _parse_method_list(cct->_conf->auth_supported, &cluster_methods);
-    _parse_method_list(cct->_conf->auth_supported, &service_methods);
-    _parse_method_list(cct->_conf->auth_supported, &client_methods);
-  } else {
-    _parse_method_list(cct->_conf->auth_cluster_required, &cluster_methods);
-    _parse_method_list(cct->_conf->auth_service_required, &service_methods);
-    _parse_method_list(cct->_conf->auth_client_required, &client_methods);
-  }
+  auto cluster_required = cct->_conf.get_val<std::string>("auth_cluster_required");
+  auto service_required = cct->_conf.get_val<std::string>("auth_service_required");
+  auto client_required = cct->_conf.get_val<std::string>("auth_client_required");
+
+  ldout(cct,10) << __func__ << ": conf values "
+                << " cluster_required=" << cluster_required
+                << " service_required=" << service_required
+                << " client_required=" << client_required
+                << dendl;
+
+  _parse_method_list(cluster_required, &cluster_methods);
+  _parse_method_list(service_required, &service_methods);
+  _parse_method_list(client_required, &client_methods);
+
   _parse_mode_list(cct->_conf.get_val<string>("ms_mon_cluster_mode"),
                   &mon_cluster_modes);
   _parse_mode_list(cct->_conf.get_val<string>("ms_mon_service_mode"),

diff --git a/src/common/options/global.yaml.in b/src/common/options/global.yaml.in
index 498d7ae9e19521e651dee0bc93e036bf248bfdf4..ac9ff387d2fc1a5676b4b5523d57f46b8d17c08e 100644 (file)
--- a/src/common/options/global.yaml.in
+++ b/src/common/options/global.yaml.in
@@ -2155,7 +2155,8 @@ options:
    ``ceph-osd``, ``ceph-mds`` and ``ceph-mgr``) must authenticate with
    each other. Valid settings are ``cephx`` or ``none``.
   default: cephx
-  with_legacy: true
+  flags:
+    - runtime
 - name: auth_exit_on_failure
   type: int
   level: dev
@@ -2172,7 +2173,8 @@ options:
    to authenticate with the cluster in order to access
    Ceph services. Valid settings are ``cephx`` or ``none``.
   default: cephx
-  with_legacy: true
+  flags:
+    - runtime
 # what clients require of daemons
 - name: auth_client_required
   type: str
@@ -2182,13 +2184,8 @@ options:
    authenticate with Ceph clients. Valid settings are ``cephx``
    or ``none``.
   default: cephx, none
-  with_legacy: true
-# deprecated; default value for above if they are not defined.
-- name: auth_supported
-  type: str
-  level: advanced
-  desc: Authentication methods required (deprecated)
-  with_legacy: true
+  flags:
+    - runtime
 - name: max_rotating_auth_attempts
   type: int
   level: advanced

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index a41b72095e67d14ee3f86d0b48beff098a4589f3..d553f97a4213f54ee38ab208270608fdd62ce8cc 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -178,12 +178,8 @@ Monitor::Monitor(CephContext* cct_, string nm, MonitorDBStore *s,
   logger(NULL), cluster_logger(NULL), cluster_logger_registered(false),
   monmap(map),
   log_client(cct_, messenger, monmap, LogClient::FLAG_MON),
-  auth_cluster_required(cct,
-                       cct->_conf->auth_supported.empty() ?
-                       cct->_conf->auth_cluster_required : cct->_conf->auth_supported),
-  auth_service_required(cct,
-                       cct->_conf->auth_supported.empty() ?
-                       cct->_conf->auth_service_required : cct->_conf->auth_supported),
+  auth_cluster_required(cct, cct->_conf.get_val<std::string>("auth_cluster_required")),
+  auth_service_required(cct, cct->_conf.get_val<std::string>("auth_service_required")),
   mgr_messenger(mgr_m),
   mgr_client(cct_, mgr_m, monmap),
   gss_ktfile_client(cct->_conf.get_val<std::string>("gss_ktab_client_file")),

diff --git a/src/test/mon/test_mon_workloadgen.cc b/src/test/mon/test_mon_workloadgen.cc
index 046a4ac2dd8316ea4dd4f2fb5bc0f613bbe9af74..48e8976237a13a3def78b10a1207d4521d6f3dbb 100644 (file)
--- a/src/test/mon/test_mon_workloadgen.cc
+++ b/src/test/mon/test_mon_workloadgen.cc
@@ -357,8 +357,6 @@ class OSDStub : public TestStub
       gen(whoami),
       mon_osd_rng(STUB_MON_OSD_FIRST, STUB_MON_OSD_LAST)
   {
-    dout(20) << __func__ << " auth supported: "
-            << cct->_conf->auth_supported << dendl;
     stringstream ss;
     ss << "client-osd" << whoami;
     std::string public_msgr_type = cct->_conf->ms_public_type.empty() ? cct->_conf.get_val<std::string>("ms_type") : cct->_conf->ms_public_type;