From f777599baa9f7198c2dadcdfe5ccfc945b6ef31c Mon Sep 17 00:00:00 2001
From: John Spray <john.spray@redhat.com>
Date: Wed, 12 Jul 2017 17:19:24 -0400
Subject: [PATCH] common: update options.cc for latest additions

Signed-off-by: John Spray <john.spray@redhat.com>
---
 src/common/options.cc | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/common/options.cc b/src/common/options.cc
index c8c20908843c6..5255a66a8ed40 100644
--- a/src/common/options.cc
+++ b/src/common/options.cc
@@ -369,7 +369,6 @@ const std::vector<Option> ceph_options = {
     return 0;
   }),
 
-
   // unmodified
   Option("clog_to_monitors", Option::TYPE_STR, Option::LEVEL_ADVANCED)
   .set_default("default=true")
@@ -995,11 +994,7 @@ const std::vector<Option> ceph_options = {
   .set_description(""),
 
   Option("mon_pg_stuck_threshold", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-  .set_default(300)
-  .set_description(""),
-
-  Option("mon_health_max_detail", Option::TYPE_INT, Option::LEVEL_ADVANCED)
-  .set_default(50)
+  .set_default(60)
   .set_description(""),
 
   Option("mon_pg_min_inactive", Option::TYPE_UINT, Option::LEVEL_ADVANCED)
@@ -1170,6 +1165,14 @@ const std::vector<Option> ceph_options = {
   .set_default(60.0)
   .set_description(""),
 
+  Option("mon_health_preluminous_compat", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
+  .set_default(false)
+  .set_description(""),
+
+  Option("mon_health_max_detail", Option::TYPE_INT, Option::LEVEL_ADVANCED)
+  .set_default(50)
+  .set_description(""),
+
   Option("mon_data_avail_crit", Option::TYPE_INT, Option::LEVEL_ADVANCED)
   .set_default(5)
   .set_description(""),
@@ -5271,6 +5274,10 @@ const std::vector<Option> ceph_options = {
   .set_default(1.0)
   .set_description(""),
 
+  Option("mgr_service_beacon_grace", Option::TYPE_FLOAT, Option::LEVEL_ADVANCED)
+  .set_default(60.0)
+  .set_description(""),
+
   Option("mon_mgr_digest_period", Option::TYPE_INT, Option::LEVEL_ADVANCED)
   .set_default(5)
   .set_description(""),
@@ -5283,6 +5290,10 @@ const std::vector<Option> ceph_options = {
   .set_default(60)
   .set_description(""),
 
+  Option("mon_mgr_mkfs_grace", Option::TYPE_INT, Option::LEVEL_ADVANCED)
+  .set_default(60)
+  .set_description(""),
+
   Option("rgw_crypt_require_ssl", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
   .set_default(true)
   .set_description(""),
@@ -5359,6 +5370,10 @@ const std::vector<Option> ceph_options = {
   .set_default("")
   .set_description(""),
 
+  Option("rgw_swift_need_stats", Option::TYPE_BOOL, Option::LEVEL_ADVANCED)
+  .set_default(true)
+  .set_description(""),
+
   Option("rgw_reshard_num_logs", Option::TYPE_INT, Option::LEVEL_ADVANCED)
   .set_default(16)
   .set_description(""),
@@ -5379,4 +5394,3 @@ const std::vector<Option> ceph_options = {
   .set_default(60 * 10)
   .set_description(""),
 };
-
-- 
2.39.5