From 2852a5f533a5cf044517fa288e8076ac493b1da0 Mon Sep 17 00:00:00 2001 From: John Spray Date: Mon, 22 Jan 2018 13:42:20 +0000 Subject: [PATCH] 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 (cherry picked from commit 1e06fe003e50d360b5c5ce9824bba044b6406ec5) --- src/mon/MonClient.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc index 850b38d69b605..952c61a8f0b96 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;