common: update options.cc for latest master

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/common/options.cc b/src/common/options.cc
index 88a3817c1ac0ad1492066a144ae9aba165a8fded..5f2e1f574c312e0e909ab832c32b3c2c0cc333a1 100644 (file)
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -149,6 +149,11 @@ const std::vector<Option> ceph_options = {
   .set_description("public-facing address to bind to")
   .add_service("mon mds osd mgr"),
 
+  Option("public_bind_addr", Option::TYPE_ADDR, Option::LEVEL_ADVANCED)
+  .set_default(entity_addr_t())
+  .add_service("mon")
+  .set_description(""),
+
   Option("cluster_addr", Option::TYPE_ADDR, Option::LEVEL_BASIC)
   .set_description("cluster-facing address to bind to")
   .add_service("osd")
@@ -1376,6 +1381,10 @@ const std::vector<Option> ceph_options = {
   .set_default(60*60)
   .set_description(""),
 
+  Option("mon_osd_crush_smoke_test", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
+  .set_default(true)
+  .set_description(""),
+
   Option("paxos_stash_full_interval", Option::TYPE_INT, Option::LEVEL_ADVANCED)
   .set_default(25)
   .set_description(""),
@@ -4580,6 +4589,10 @@ const std::vector<Option> ceph_options = {
   .set_default("")
   .set_description(""),
 
+  Option("rgw_acl_grants_max_num", Option::TYPE_INT, Option::LEVEL_ADVANCED)
+  .set_default(100)
+  .set_description(""),
+
   Option("rgw_max_chunk_size", Option::TYPE_INT, Option::LEVEL_ADVANCED)
   .set_default(4 * 1024 * 1024)
   .set_description(""),