From: John Wilkins <john.wilkins@inktank.com>
Date: Fri, 24 Jan 2014 01:11:59 +0000 (-0800)
Subject: doc: Added domain pool, and changed zone configs to use domain tool so they don't... 
X-Git-Tag: v0.78~277
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ea026c6cc9676455ceb2a7603d0fea66101e8700;p=ceph.git

doc: Added domain pool, and changed zone configs to use domain tool so they don't clash.

Signed-off-by: John Wilkins <john.wilkins@inktank.com>
---

diff --git a/doc/radosgw/federated-config.rst b/doc/radosgw/federated-config.rst
index 3c4438a2d452..2201817483fc 100644
--- a/doc/radosgw/federated-config.rst
+++ b/doc/radosgw/federated-config.rst
@@ -105,6 +105,7 @@ prefer. For example:
 
 - ``.us.rgw.root``
 
+- ``.us-east.domain.rgw``
 - ``.us-east.rgw.root``
 - ``.us-east.rgw.control``
 - ``.us-east.rgw.gc``
@@ -118,6 +119,7 @@ prefer. For example:
 - ``.us-east.users.swift``
 - ``.us-east.users.uid``
 
+- ``.us-west.domain.rgw``
 - ``.us-west.rgw.root``
 - ``.us-west.rgw.control``
 - ``.us-west.rgw.gc``
@@ -449,7 +451,7 @@ Create Zones
    gateway pools. See `Configuration Reference - Zones`_ for additional 
    details on zones. ::
 
-	{ "domain_root": ".us-east.rgw.root",
+	{ "domain_root": ".us-east.domain.rgw",
 	  "control_pool": ".us-east.rgw.control",
 	  "gc_pool": ".us-east.rgw.gc",
 	  "log_pool": ".us-east.log",
@@ -528,7 +530,7 @@ the synchronization agents can authenticate with the zones.
    zone users into the ``system_key`` field of your zone configuration 
    infile. ::
 
-	{ "domain_root": ".us-east.rgw",
+	{ "domain_root": ".us-east.domain.rgw",
 	  "control_pool": ".us-east.rgw.control",
 	  "gc_pool": ".us-east.rgw.gc",
 	  "log_pool": ".us-east.log",