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>

diff --cc doc/radosgw/config-ref.rst
Simple merge

diff --cc src/rgw/rgw_swift_auth.cc
index d4e07d0772d409c91740021f11578777c0142974,a5589cbc314a69cffc9fbfc14b3d8657f6043ed4..eb90f051c5ab21c8f7e06799de9fe3a51662a7f0
--- 1/src/rgw/rgw_swift_auth.cc
--- 2/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;