mon: require SERVER_LUMINOUS from mons, osds

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/ceph_mon.cc b/src/ceph_mon.cc
index 3663bb04e4b3c3e71dc20bace01969fcb92eb7ee..319ffbea0b4a9564e20768625753181f45fd7318 100644 (file)
--- a/src/ceph_mon.cc
+++ b/src/ceph_mon.cc
@@ -679,13 +679,10 @@ int main(int argc, const char **argv)
   msgr->set_default_policy(Messenger::Policy::stateless_server(0));
   msgr->set_policy(entity_name_t::TYPE_MON,
                    Messenger::Policy::lossless_peer_reuse(
-                    CEPH_FEATURE_UID |
-                    CEPH_FEATURE_PGID64 |
-                    CEPH_FEATURE_MON_SINGLE_PAXOS));
+                    CEPH_FEATURE_SERVER_LUMINOUS));
   msgr->set_policy(entity_name_t::TYPE_OSD,
                    Messenger::Policy::stateless_server(
-                    CEPH_FEATURE_PGID64 |
-                    CEPH_FEATURE_OSDENC));
+                    CEPH_FEATURE_SERVER_LUMINOUS));
   msgr->set_policy(entity_name_t::TYPE_CLIENT,
                    Messenger::Policy::stateless_server(0));
   msgr->set_policy(entity_name_t::TYPE_MDS,