]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw suite: create default zone after zonegroup creation
authorOrit Wasserman <owasserm@redhat.com>
Mon, 22 Feb 2016 14:19:21 +0000 (15:19 +0100)
committerOrit Wasserman <owasserm@redhat.com>
Tue, 19 Apr 2016 10:39:06 +0000 (12:39 +0200)
Signed-off-by: Orit Wasserman <owasserm@redhat.com>
tasks/rgw.py

index 74437d9b7e4a3272fe3adc3d677ab25c895e1ab6..697be223cf63a8666299bd6656ad35268b7ecb9c 100644 (file)
@@ -912,11 +912,6 @@ def configure_regions_and_zones(ctx, config, regions, role_endpoints, realm):
                  stdin=StringIO(zone_json),
                  check_status=True)
 
-        (zonegroup, zone, zone_info, user_info) = role_zones[client]
-        rgwadmin(ctx, client,
-                 cmd=['zone', 'default', zone],
-                 check_status=True)
-
         for region, info in region_info.iteritems():
             region_json = json.dumps(info)
             log.debug('region info is: %s', region_json)
@@ -931,7 +926,7 @@ def configure_regions_and_zones(ctx, config, regions, role_endpoints, realm):
 
         (zonegroup, zone, zone_info, user_info) = role_zones[client]
         rgwadmin(ctx, client,
-                 cmd=['zone', 'default', master_zone],
+                 cmd=['zone', 'default', zone],
                  check_status=True)
 
     rgwadmin(ctx, master_client,