]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
rgw: don't make domain_root pool the same as zone root
authorJosh Durgin <josh.durgin@inktank.com>
Fri, 2 Aug 2013 01:54:52 +0000 (18:54 -0700)
committerJosh Durgin <josh.durgin@inktank.com>
Fri, 2 Aug 2013 02:12:01 +0000 (19:12 -0700)
These are supposed to be separate pools.

Signed-off-by: Josh Durgin <josh.durgin@inktank.com>
teuthology/task/rgw.py

index 3ceb1cf3b6238f773a7ef64a96b712fef05539ba..06d0d7fdf23112f3dc1bc1a28f2674c4b7a02c10 100644 (file)
@@ -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.