From 3dc80e5f9b6ebf1bc1cecbd95b288005216bdbec Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 4 May 2018 10:30:03 -0500 Subject: [PATCH] mon: require cephx v2 signatures from other mons for >= mimic Signed-off-by: Sage Weil --- src/mon/Monitor.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index d1c84eaf2b5..a8ecb2eebf4 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -2198,7 +2198,8 @@ void Monitor::calc_quorum_requirements() required_features |= CEPH_FEATUREMASK_SERVER_LUMINOUS; } if (features.incompat.contains(CEPH_MON_FEATURE_INCOMPAT_MIMIC)) { - required_features |= CEPH_FEATUREMASK_SERVER_MIMIC; + required_features |= CEPH_FEATUREMASK_SERVER_MIMIC | + CEPH_FEATUREMASK_CEPHX_V2; } // monmap @@ -2212,7 +2213,8 @@ void Monitor::calc_quorum_requirements() } if (monmap->get_required_features().contains_all( ceph::features::mon::FEATURE_MIMIC)) { - required_features |= CEPH_FEATUREMASK_SERVER_MIMIC; + required_features |= CEPH_FEATUREMASK_SERVER_MIMIC | + CEPH_FEATUREMASK_CEPHX_V2; } dout(10) << __func__ << " required_features " << required_features << dendl; }