]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw suite: different clients have different defaults zone
authorOrit Wasserman <owasserm@redhat.com>
Mon, 22 Feb 2016 12:23:50 +0000 (13:23 +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 13f1d74c7246f78c6e755c51651125b0951470b4..0d4a7941a1b9453917e59538d1daf5155c786ff3 100644 (file)
@@ -910,10 +910,11 @@ def configure_regions_and_zones(ctx, config, regions, role_endpoints, realm):
                       '--rgw-zone', zone],
                  stdin=StringIO(zone_json),
                  check_status=True)
-            if zone == master_zone:
-                rgwadmin(ctx, client,
-                         cmd=['zone', 'default', master_zone],
-                         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)