]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mon: fix mgr using auth_client_required policy
authorJohn Spray <john.spray@redhat.com>
Mon, 22 Jan 2018 13:42:20 +0000 (13:42 +0000)
committerJohn Spray <john.spray@redhat.com>
Mon, 22 Jan 2018 13:43:45 +0000 (13:43 +0000)
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>
src/mon/MonClient.cc

index fd48ee6e125d9e4759ce381b3a05f11ede21bdab..50fb3f74d75d0c6e5ea50ff00612b2981b3235b0 100644 (file)
@@ -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;