mon: require cephx v2 signatures from other mons for >= mimic

Signed-off-by: Sage Weil <sage@redhat.com>
(cherry picked from commit 3dc80e5f9b6ebf1bc1cecbd95b288005216bdbec)

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 1c737f880b2b60691d8ae3c3aed1e0d028f3c080..b4449a2d4dae108298e3ac64286f2b35ad899dec 100644 (file)
--- 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;
 }