commit fb3303d06518b9dd244f6770dfba3435407d832b
author Mateusz Los <mlos@mirantis.com> Mon Jan 21 11:25:15 2019 +0100
committer Vasyl Saienko <vsaienko@mirantis.com> Fri Jan 25 06:15:55 2019 +0000
tree 97ee8d8629855a0ef2862133cb1e224d4603d89f
parent a1807a9db121b8fecb950611b06202df484e9c65

added missing AUTH_%(tenant_id)s in path for swift endpoint

Change-Id: Idbc7e33a87558cceaedd3a7ba53c76a2673105d3
Related-Prod: PROD-26452

keystone/client/service/radosgw-swift.yml

diff --git a/keystone/client/service/radosgw-swift.yml b/keystone/client/service/radosgw-swift.yml
index e3f8157..cd495ee 100644
--- a/keystone/client/service/radosgw-swift.yml
+++ b/keystone/client/service/radosgw-swift.yml
@@ -31,12 +31,12 @@
                   public_address: ${_param:cluster_public_host}
                   public_protocol: ${_param:cluster_public_protocol}
                   public_port: ${_param:radosgw_swift_cluster_port}
-                  public_path: '/swift/v1' # /$(project_id)s
+                  public_path: '/swift/v1/AUTH_%(tenant_id)s'
                   internal_address: ${_param:radosgw_service_host}
                   internal_port: ${_param:radosgw_swift_cluster_port}
-                  internal_path: '/swift/v1'
+                  internal_path: '/swift/v1/AUTH_%(tenant_id)s'
                   internal_protocol: ${_param:radosgw_service_protocol}
                   admin_protocol: ${_param:radosgw_service_protocol}
                   admin_address: ${_param:radosgw_service_host}
                   admin_port: ${_param:radosgw_swift_cluster_port}
-                  admin_path: '/swift/v1'
+                  admin_path: '/swift/v1/AUTH_%(tenant_id)s'

keystone/client/v3/service/radosgw-swift.yml

diff --git a/keystone/client/v3/service/radosgw-swift.yml b/keystone/client/v3/service/radosgw-swift.yml
index b9fadc8..d1acce3 100644
--- a/keystone/client/v3/service/radosgw-swift.yml
+++ b/keystone/client/v3/service/radosgw-swift.yml
@@ -30,13 +30,13 @@
               endpoints:
                 radosgw-swift_public:
                   interface: 'public'
-                  url: ${_param:cluster_public_protocol}://${_param:cluster_public_host}:${_param:radosgw_swift_cluster_port}/swift/v1
+                  url: ${_param:cluster_public_protocol}://${_param:cluster_public_host}:${_param:radosgw_swift_cluster_port}/swift/v1/AUTH_%(tenant_id)s
                   region: ${_param:openstack_region}
                 radosgw-swift_internal:
                   interface: 'internal'
-                  url: ${_param:radosgw_service_protocol}://${_param:radosgw_service_host}:${_param:radosgw_swift_cluster_port}/swift/v1
+                  url: ${_param:radosgw_service_protocol}://${_param:radosgw_service_host}:${_param:radosgw_swift_cluster_port}/swift/v1/AUTH_%(tenant_id)s
                   region: ${_param:openstack_region}
                 radosgw-swift_admin:
                   interface: 'admin'
-                  url: ${_param:radosgw_service_protocol}://${_param:radosgw_service_host}:${_param:radosgw_swift_cluster_port}/swift/v1
+                  url: ${_param:radosgw_service_protocol}://${_param:radosgw_service_host}:${_param:radosgw_swift_cluster_port}/swift/v1/AUTH_%(tenant_id)s
                   region: ${_param:openstack_region}