]> git-server-git.apps.pok.os.sepia.ceph.com Git - teuthology.git/commitdiff
rgw: persist the region info
authorJoe Buck <jbbuck@gmail.com>
Sat, 24 Aug 2013 02:25:26 +0000 (19:25 -0700)
committerJoe Buck <jbbuck@gmail.com>
Wed, 28 Aug 2013 16:00:52 +0000 (09:00 -0700)
The rgw task deletes the region info
from the config structure. The s3tests
task needs this info, so we persist
it by sticking it in the ctx object.

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

index 8e8e0e2652350ec94b9f66b6236613147ba921a5..82cac99fa08529f071c2c85c114a0595034ddee1 100644 (file)
@@ -584,6 +584,8 @@ def task(ctx, config):
     role_endpoints = assign_ports(ctx, config)
     ctx.rgw = argparse.Namespace()
     ctx.rgw.role_endpoints = role_endpoints
+    # stash the region info for later, since it was deleted from the config structure
+    ctx.rgw.regions = regions
 
     with contextutil.nested(
         lambda: create_dirs(ctx=ctx, config=config),