From: Orit Wasserman <owasserm@redhat.com>
Date: Tue, 24 May 2016 18:11:57 +0000 (+0200)
Subject: Merge pull request #8093 from zaitcev/swift-root-prefix
X-Git-Tag: v11.0.0~433
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8b5bbe9ed4ca96b384d14c0ad2418a87f9e496d5;p=ceph.git

Merge pull request #8093 from zaitcev/swift-root-prefix

rgw: Allow to serve Swift off the URL root
Reviewed-by: Orit Wasserman <owasserm@redhat.com>
---

8b5bbe9ed4ca96b384d14c0ad2418a87f9e496d5
diff --cc src/rgw/rgw_swift_auth.cc
index d4e07d0772d40,a5589cbc314a6..eb90f051c5ab2
--- a/src/rgw/rgw_swift_auth.cc
+++ b/src/rgw/rgw_swift_auth.cc
@@@ -217,11 -228,11 +230,11 @@@ void RGW_SWIFT_Auth_Get::execute(
      tenant_path.append(g_conf->rgw_swift_tenant_name);
    } else if (g_conf->rgw_swift_account_in_url) {
      tenant_path = "/AUTH_";
 -    tenant_path.append(user_str);
 +    tenant_path.append(info.user_id.to_str());
    }
  
-   STREAM_IO(s)->print("X-Storage-Url: %s/%s/v1%s\r\n", swift_url.c_str(),
- 		swift_prefix.c_str(), tenant_path.c_str());
+   STREAM_IO(s)->print("X-Storage-Url: %s%s/v1%s\r\n", swift_url.c_str(),
+ 	        swift_prefix.c_str(), tenant_path.c_str());
  
    if ((ret = encode_token(s->cct, swift_key->id, swift_key->key, bl)) < 0)
      goto done;