From: Abhishek L <abhishek.lekshmanan@gmail.com>
Date: Wed, 24 Jan 2018 14:23:54 +0000 (+0100)
Subject: Merge pull request #19446 from smithfarm/wip-22404-luminous
X-Git-Tag: v12.2.3~187
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=61ec339e6cba3935f531886684d25cd5708fb67a;p=ceph.git

Merge pull request #19446 from smithfarm/wip-22404-luminous

luminous: doc: crush_ruleset is invalid command in luminous

Reviewed-By: Abhishek Lekshmanan <abhishek@suse.com>
---

61ec339e6cba3935f531886684d25cd5708fb67a
diff --cc doc/install/install-ceph-gateway.rst
index 2ca865521e6,2f0faf16d63..8c4d96d3b2e
--- a/doc/install/install-ceph-gateway.rst
+++ b/doc/install/install-ceph-gateway.rst
@@@ -265,25 -265,26 +265,25 @@@ On Ubuntu execute:
   sudo service radosgw restart id=rgw.<short-hostname>
  
  For federated configurations, each zone may have a different ``index_pool``
 -setting for failover. To make the value consistent for a region's zones, you
 -may set ``rgw_override_bucket_index_max_shards`` in a gateway's region
 +setting for failover. To make the value consistent for a zonegroup's zones, you
 +may set ``rgw_override_bucket_index_max_shards`` in a gateway's zonegroup
  configuration. For example::
  
 -  radosgw-admin region get > region.json
 +  radosgw-admin zonegroup get > zonegroup.json
  
 -Open the ``region.json`` file and edit the ``bucket_index_max_shards`` setting
 -for each named zone. Save the ``region.json`` file and reset the region. For
 -example::
 +Open the ``zonegroup.json`` file and edit the ``bucket_index_max_shards`` setting
 +for each named zone. Save the ``zonegroup.json`` file and reset the zonegroup.
 +For example::
  
 -   radosgw-admin region set < region.json
 +   radosgw-admin zonegroup set < zonegroup.json
  
 -Once you have updated your region, update the region map. For example::
 +Once you have updated your zonegroup, update and commit the period.
 +For example::
  
 -   radosgw-admin regionmap update --name client.rgw.ceph-client
 -
 -Where ``client.rgw.ceph-client`` is the name of the gateway user.
 +   radosgw-admin period update --commit
  
  .. note:: Mapping the index pool (for each zone, if applicable) to a CRUSH
-           ruleset of SSD-based OSDs may also help with bucket index performance.
+           rule of SSD-based OSDs may also help with bucket index performance.
  
  Add Wildcard to DNS
  -------------------