From: John Spray <john.spray@redhat.com>
Date: Mon, 22 Jan 2018 13:42:20 +0000 (+0000)
Subject: mon: fix mgr using auth_client_required policy
X-Git-Tag: v13.0.2~436^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=1e06fe003e50d360b5c5ce9824bba044b6406ec5;p=ceph.git

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>
---

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index fd48ee6e125d..50fb3f74d75d 100644
--- 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;