From: Casey Bodley <cbodley@redhat.com>
Date: Wed, 29 Mar 2017 20:41:39 +0000 (-0400)
Subject: doc/rgw: update section on global quotas
X-Git-Tag: v12.0.2~191^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F14252%2Fhead;p=ceph.git

doc/rgw: update section on global quotas

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/doc/radosgw/admin.rst b/doc/radosgw/admin.rst
index cfbbb2b77241..06d0cc608d90 100644
--- a/doc/radosgw/admin.rst
+++ b/doc/radosgw/admin.rst
@@ -413,18 +413,22 @@ new user, and that quota is enabled.  See ``rgw bucket default quota max objects
 Reading / Writing Global Quotas
 -------------------------------
 
-You can read and write quota settings in a region map. To get a
-region map, execute the following. :: 
+You can read and write global quota settings in the period configuration. To
+view the global quota settings::
 
-	radosgw-admin regionmap get > regionmap.json
+	radosgw-admin global quota get
 
-To set quota settings for the entire region, simply modify the 
-quota settings in the region map. Then, use ``region set`` to 
-update the region map. ::
+The global quota settings can be manipulated with the ``global quota``
+counterparts of the ``quota set``, ``quota enable``, and ``quota disable``
+commands. ::
 
-	radosgw-admin region set < regionmap.json
+	radosgw-admin global quota set --quota-scope bucket --max-objects 1024
+	radosgw-admin global quota enable --quota-scope bucket
 
-.. note:: After updating the region map, you must restart the gateway.
+.. note:: In a multisite configuration, where there is a realm and period
+   present, changes to the global quotas must be committed using ``period
+   update --commit``. If there is no period present, the rados gateway(s) must
+   be restarted for the changes to take effect.
 
 
 Usage