openstack/python-swiftclient
Code Issues Proposed changes

Merge "Make swiftclient respect region_name when using sessions"

Browse Source
This commit is contained in:
Zuul
2018-06-01 00:18:46 +00:00
committed by Gerrit Code Review
parent 78b8390072 1971ef880f
commit 453544aece
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
swiftclient/client.py
View File

@@ -644,8 +644,10 @@ def get_auth(auth_url, user, key, **kwargs):
if session: if session:
service_type = os_options.get('service_type', 'object-store') service_type = os_options.get('service_type', 'object-store')
interface = os_options.get('endpoint_type', 'public') interface = os_options.get('endpoint_type', 'public')
region_name = os_options.get('region_name')
storage_url = session.get_endpoint(service_type=service_type, storage_url = session.get_endpoint(service_type=service_type,
interface=interface) interface=interface,
region_name=region_name)
token = session.get_token() token = session.get_token()
elif auth_version in AUTH_VERSIONS_V1: elif auth_version in AUTH_VERSIONS_V1:
storage_url, token = get_auth_1_0(auth_url, storage_url, token = get_auth_1_0(auth_url,