mon: fix mgr using auth_client_required policy

This caused mgr daemons to fail to authenticate
when auth_client_required was set to something
different to auth_cluster_required.

Fixes: https://tracker.ceph.com/issues/22096
Signed-off-by: John Spray <john.spray@redhat.com>
(cherry picked from commit 1e06fe003e50d360b5c5ce9824bba044b6406ec5)

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 850b38d69b605b47ba84b5989a00494134502a57..952c61a8f0b962cad978f71ae2915d3cbf224769 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -366,7 +366,8 @@ int MonClient::init()
     method = cct->_conf->auth_supported;
   else if (entity_name.get_type() == CEPH_ENTITY_TYPE_OSD ||
           entity_name.get_type() == CEPH_ENTITY_TYPE_MDS ||
-          entity_name.get_type() == CEPH_ENTITY_TYPE_MON)
+          entity_name.get_type() == CEPH_ENTITY_TYPE_MON ||
+          entity_name.get_type() == CEPH_ENTITY_TYPE_MGR)
     method = cct->_conf->auth_cluster_required;
   else
     method = cct->_conf->auth_client_required;