Merge pull request #13278 from liewegas/wip-luminous

mon,osd: luminous feature bits, require flags, upgrade gates

Reviewed-by: Josh Durgin <jdurgin@redhat.com>

diff --cc src/mon/MonCommands.h
index 769dbbc8df3b3965bdf77de281cd4e50e4cb8035,e1136d1a10eb5bb2d117bcfbc9b6ced2893ade35..b128b5f9b8a143b3a7ccb0f25b8cb631c8a683be
--- 1/src/mon/MonCommands.h
--- 2/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@@ -649,10 -649,10 +649,10 @@@ COMMAND("osd erasure-code-profile ls", 
        "list all erasure code profiles", \
        "osd", "r", "cli,rest")
  COMMAND("osd set " \
-       "name=key,type=CephChoices,strings=full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent|sortbitwise|require_jewel_osds|require_kraken_osds", \
+       "name=key,type=CephChoices,strings=full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent|sortbitwise|require_jewel_osds|require_kraken_osds|require_luminous_osds", \
        "set <key>", "osd", "rw", "cli,rest")
  COMMAND("osd unset " \
 -      "name=key,type=CephChoices,strings=full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent|sortbitwise", \
 +      "name=key,type=CephChoices,strings=full|pause|noup|nodown|noout|noin|nobackfill|norebalance|norecover|noscrub|nodeep-scrub|notieragent", \
        "unset <key>", "osd", "rw", "cli,rest")
  COMMAND("osd cluster_snap", "take cluster snapshot (disabled)", \
        "osd", "r", "")

diff --cc src/mon/OSDMonitor.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge