From: Orit Wasserman <owasserm@redhat.com>
Date: Wed, 2 Dec 2015 09:47:47 +0000 (+0100)
Subject: rgw: use zonegroup id for location constrain
X-Git-Tag: v10.1.0~354^2~164
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=eca0bb842e6bbacdb642ae929749781a665c2cf3;p=ceph.git

rgw: use zonegroup id for location constrain

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

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index b8399ed58d58..aa4a1702f46a 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -469,7 +469,7 @@ void RGWGetBucketLocation_ObjStore_S3::send_response()
   if (ret >= 0) {
     api_name = zonegroup.api_name;
   } else  {
-    if (api_name != "default") {
+    if (s->bucket_info.zonegroup != "default") {
       api_name = s->bucket_info.zonegroup;
     }
   }