summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Wilkins <john.wilkins@inktank.com>2013-09-04 15:37:14 -0700
committerJohn Wilkins <john.wilkins@inktank.com>2013-09-04 15:37:14 -0700
commit83a4848e27b127b11df90c12dd2f52d03c023005 (patch)
tree36945903fd82fc7f4b54b38f82582e118230a508
parentdf112473bc42203453c0574ae51ceb7fa14e852d (diff)
downloadceph-83a4848e27b127b11df90c12dd2f52d03c023005.tar.gz
doc: Updated usage for --infile syntax. Added zone name for zone syntax.
Signed-off-by: John Wilkins <john.wilkins@inktank.com>
-rw-r--r--doc/radosgw/config-ref.rst8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/radosgw/config-ref.rst b/doc/radosgw/config-ref.rst
index 57c1c6f5577..ea650f0683a 100644
--- a/doc/radosgw/config-ref.rst
+++ b/doc/radosgw/config-ref.rst
@@ -422,7 +422,7 @@ the object to a file (e.g., ``region.json``); then, execute the following
command::
- sudo radosgw-admin region set < region.json
+ sudo radosgw-admin region set --infile region.json
Where ``region.json`` is the JSON file you created.
@@ -476,7 +476,7 @@ JSON object is an example of a default region map.
To set a region map, execute the following::
- sudo radosgw-admin region-map set < regionmap.json
+ sudo radosgw-admin region-map set --infile regionmap.json
Where ``regionmap.json`` is the JSON file you created. Ensure that you have
zones created for the ones specified in the region map. Finally, update the map.
@@ -546,9 +546,9 @@ the same as the zone name. See `Pools`_ for details of configuring pools.
To set a zone, create a JSON object consisting of the pools, save
the object to a file (e.g., ``zone.json``); then, execute the following
-command::
+command, replacing ``{zone-name}`` with the name of the zone::
- sudo radosgw-admin zone set < zone.json
+ sudo radosgw-admin zone set --rgw-zone={zone-name} --infile zone.json
Where ``zone.json`` is the JSON file you created.