From b8120f7c7a44e90b941ea5441c38af3bec24d69b Mon Sep 17 00:00:00 2001 From: Orit Wasserman Date: Tue, 19 Jan 2016 15:37:40 +0100 Subject: [PATCH] rgw suite: use zonegroups instead of regions Signed-off-by: Orit Wasserman --- tasks/util/rgw.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/util/rgw.py b/tasks/util/rgw.py index cf06443ef34..f7d6ba58a9b 100644 --- a/tasks/util/rgw.py +++ b/tasks/util/rgw.py @@ -71,7 +71,7 @@ def get_user_successful_ops(out, user): def get_zone_host_and_port(ctx, client, zone): _, region_map = rgwadmin(ctx, client, check_status=True, cmd=['-n', client, 'region-map', 'get']) - regions = region_map['regions'] + regions = region_map['zonegroups'] for region in regions: for zone_info in region['val']['zones']: if zone_info['name'] == zone: @@ -85,7 +85,7 @@ def get_zone_host_and_port(ctx, client, zone): def get_master_zone(ctx, client): _, region_map = rgwadmin(ctx, client, check_status=True, cmd=['-n', client, 'region-map', 'get']) - regions = region_map['regions'] + regions = region_map['zonegroups'] for region in regions: is_master = (region['val']['is_master'] == "true") log.info('region={r} is_master={ism}'.format(r=region, ism=is_master)) -- 2.39.5