From 9be267fff40a8e252ef989343d8662b1f90a916a Mon Sep 17 00:00:00 2001
From: Rodrigo Severo <rodrigo@fabricadeideias.com>
Date: Tue, 26 Nov 2019 16:32:56 -0300
Subject: [PATCH 1/2] wip-doc: entries obsoleted by allow_standby_replay

Nautilus release presented the allow_standby_replay fs setting that obsdoleted
several MDS config entries:  mds_standby_for_*, mon_force_standby_active, and
mds_standby_replay.

Signed-off-by: Rodrigo Severo <rodrigo@fabricadeideias.com>
---
 doc/cephfs/mds-config-ref.rst | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/doc/cephfs/mds-config-ref.rst b/doc/cephfs/mds-config-ref.rst
index 4e7a5abc0c8..74e2b75e88a 100644
--- a/doc/cephfs/mds-config-ref.rst
+++ b/doc/cephfs/mds-config-ref.rst
@@ -8,7 +8,10 @@
               under ``[mon]`` or ``[global]``.
 
 :Type: Boolean
-:Default: ``true`` 
+:Default: ``true``
+:Obsoleted: Please see "Configuring standby-replay" in :doc:`/cephfs/standby`.
+
+.. deprecated:: 14.2.0
 
 ``mds cache memory limit``
 
@@ -547,6 +550,9 @@
 
 :Type:  String
 :Default: N/A
+:Obsoleted: Please see "Configuring standby-replay" in :doc:`/cephfs/standby`.
+
+.. deprecated:: 14.2.0
 
 
 ``mds standby for rank``
@@ -554,6 +560,9 @@
 :Description: An MDS daemon will standby for an MDS daemon of this rank. 
 :Type:  32-bit Integer
 :Default: ``-1``
+:Obsoleted: Please see "Configuring standby-replay" in :doc:`/cephfs/standby`.
+
+.. deprecated:: 14.2.0
 
 
 ``mds standby replay``
@@ -563,6 +572,9 @@
               
 :Type:  Boolean
 :Default:  ``false``
+:Obsoleted: Please see "Configuring standby-replay" in :doc:`/cephfs/standby`.
+
+.. deprecated:: 14.2.0
 
 
 ``mds min caps per client``

From 2ee56b6a68c9796b26f5dff9748e10e35afac7e8 Mon Sep 17 00:00:00 2001
From: Rodrigo Severo <rodrigo@fabricadeideias.com>
Date: Thu, 5 Dec 2019 13:41:33 -0300
Subject: [PATCH 2/2] doc: obsolete entries for allow_standby_replay

Nautilus release presented the allow_standby_replay fs setting that obsdoleted
several MDS config entries:  mds_standby_for_*, mon_force_standby_active, and
mds_standby_replay.

Removing entries instead of just marking them as "Obsolete' as per batrick
suggestion.

Signed-off-by: Rodrigo Severo <rodrigo@fabricadeideias.com>
---
 doc/cephfs/mds-config-ref.rst | 45 -----------------------------------
 1 file changed, 45 deletions(-)

diff --git a/doc/cephfs/mds-config-ref.rst b/doc/cephfs/mds-config-ref.rst
index 74e2b75e88a..b91a44245b4 100644
--- a/doc/cephfs/mds-config-ref.rst
+++ b/doc/cephfs/mds-config-ref.rst
@@ -2,17 +2,6 @@
  MDS Config Reference
 ======================
 
-``mon force standby active`` 
-
-:Description: If ``true`` monitors force standby-replay to be active. Set
-              under ``[mon]`` or ``[global]``.
-
-:Type: Boolean
-:Default: ``true``
-:Obsoleted: Please see "Configuring standby-replay" in :doc:`/cephfs/standby`.
-
-.. deprecated:: 14.2.0
-
 ``mds cache memory limit``
 
 :Description: The memory limit the MDS should enforce for its cache.
@@ -543,40 +532,6 @@
 :Default: ``0``
 
 
-``mds standby for name``
-
-:Description: An MDS daemon will standby for another MDS daemon of the name 
-              specified in this setting.
-
-:Type:  String
-:Default: N/A
-:Obsoleted: Please see "Configuring standby-replay" in :doc:`/cephfs/standby`.
-
-.. deprecated:: 14.2.0
-
-
-``mds standby for rank``
-
-:Description: An MDS daemon will standby for an MDS daemon of this rank. 
-:Type:  32-bit Integer
-:Default: ``-1``
-:Obsoleted: Please see "Configuring standby-replay" in :doc:`/cephfs/standby`.
-
-.. deprecated:: 14.2.0
-
-
-``mds standby replay``
-
-:Description: Determines whether a ``ceph-mds`` daemon should poll and replay 
-              the log of an active MDS (hot standby).
-              
-:Type:  Boolean
-:Default:  ``false``
-:Obsoleted: Please see "Configuring standby-replay" in :doc:`/cephfs/standby`.
-
-.. deprecated:: 14.2.0
-
-
 ``mds min caps per client``
 
 :Description: Set the minimum number of capabilities a client may hold.