doc: rgw_region_root_pool option should be in [global]

     add new option rgw_zonegroup_root_pool from Jewel.

Fixes: #15244
Signed-off-by: Vikhyat Umrao <vumrao@redhat.com>

diff --git a/doc/radosgw/config-ref.rst b/doc/radosgw/config-ref.rst
index f66738ee1a7dfcb301b25b84006974614dee6b8b..d82efbf3db29e142ceaa346d9218b8734faa4aef 100644 (file)
--- a/doc/radosgw/config-ref.rst
+++ b/doc/radosgw/config-ref.rst
@@ -709,9 +709,17 @@ configuration.
 ``rgw region root pool``
 
 :Description: The pool for storing all region-specific information.
+              Not used in Ceph version ``Jewel``.
 :Type: String
 :Default: ``.rgw.root``
 
+.. versionadded:: Jewel
+
+``rgw zonegroup root pool``
+
+:Description: The pool for storing all zonegroup-specific information.
+:Type: String
+:Default: ``.rgw.root``
 
 
 .. versionadded:: v.67

diff --git a/doc/radosgw/federated-config.rst b/doc/radosgw/federated-config.rst
index f47a0af26e1ae1f53bee8c894ddd4731991c1e25..d66d98e5938f832598b8ef77a9037ce3c27afa06 100644 (file)
--- a/doc/radosgw/federated-config.rst
+++ b/doc/radosgw/federated-config.rst
@@ -341,11 +341,12 @@ Add Instances to Ceph Config File
 On an admin node, add an entry for each instance in the Ceph configuration file
 for your Ceph Storage Cluster(s). For example:: 
 
-       ...
+       [global]
+       rgw region root pool = .us.rgw.root     # Deprecated in Jewel
+       rgw zonegroup root pool = .us.rgw.root  # From Jewel
        
        [client.radosgw.us-east-1]
        rgw region = us
-       rgw region root pool = .us.rgw.root
        rgw zone = us-east
        rgw zone root pool = .us-east.rgw.root
        keyring = /etc/ceph/ceph.client.radosgw.keyring
@@ -355,7 +356,6 @@ for your Ceph Storage Cluster(s). For example::
        
        [client.radosgw.us-west-1]
        rgw region = us
-       rgw region root pool = .us.rgw.root
        rgw zone = us-west
        rgw zone root pool = .us-west.rgw.root
        keyring = /etc/ceph/ceph.client.radosgw.keyring