From: Josh Durgin <josh.durgin@inktank.com>
Date: Fri, 2 Aug 2013 01:54:52 +0000 (-0700)
Subject: rgw: don't make domain_root pool the same as zone root
X-Git-Tag: 1.1.0~2001
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fdde365858c4dea4d69ed2027a38cbfbd5c1c167;p=teuthology.git

rgw: don't make domain_root pool the same as zone root

These are supposed to be separate pools.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
---

diff --git a/teuthology/task/rgw.py b/teuthology/task/rgw.py
index 3ceb1cf3b6..06d0d7fdf2 100644
--- a/teuthology/task/rgw.py
+++ b/teuthology/task/rgw.py
@@ -267,12 +267,10 @@ def extract_zone_info(ctx, client, client_config):
                                                                   client=client)
     region = ceph_config['rgw region']
     zone = ceph_config['rgw zone']
-    zone_info = dict(
-        domain_root=ceph_config['rgw zone root pool'],
-        )
+    zone_info = {}
     for key in ['control_pool', 'gc_pool', 'log_pool', 'intent_log_pool',
                 'usage_log_pool', 'user_keys_pool', 'user_email_pool',
-                'user_swift_pool', 'user_uid_pool']:
+                'user_swift_pool', 'user_uid_pool', 'domain_root']:
         zone_info[key] = '.' + region + '.' + zone + '.' + key
 
     # these keys are meant for the zones argument in the region info.