rgw: do not overwrite user_info with zone user_info

Signed-off-by: Orit Wasserman <owasserm@redhat.com>

diff --git a/tasks/rgw.py b/tasks/rgw.py
index 4e8fbe109e2063e732f29e7447f0628ddd1cb78b..12d5e7294630e30252a6ee48086d4cce94792967 100644 (file)
--- a/tasks/rgw.py
+++ b/tasks/rgw.py
@@ -788,7 +788,7 @@ def configure_multisite_regions_and_zones(ctx, config, regions, role_endpoints,
 
     (zonegroup, zone, zone_info, user_info) = role_zones[master_client]
     zone_json = json.dumps(dict(zone_info.items() + user_info.items()))
-    log.debug("zone info is: %s"), zone_json
+    log.debug("zone info is: %s", zone_json)
     rgwadmin(ctx, master_client,
              cmd=['zone', 'set', '--rgw-zonegroup', zonegroup,
                   '--rgw-zone', zone],
@@ -999,8 +999,8 @@ def pull_configuration(ctx, config, regions, role_endpoints, realm, master_clien
                      user_info['system_key']['secret_key']],
                      check_status=True)
 
-            (zonegroup, zone, zone_info, user_info) = role_zones[client]
-            zone_json = json.dumps(dict(zone_info.items() + user_info.items()))
+            (zonegroup, zone, zone_info, zone_user_info) = role_zones[client]
+            zone_json = json.dumps(dict(zone_info.items() + zone_user_info.items()))
             log.debug("zone info is: %s"), zone_json
             rgwadmin(ctx, client,
                      cmd=['zone', 'set', '--rgw-zonegroup', zonegroup,