summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-06-01 00:18:46 +0000
committerGerrit Code Review <review@openstack.org>2018-06-01 00:18:46 +0000
commit453544aece2f3bf272bc222ffcd9e60326cb1116 (patch)
tree6ea8f650a9cabb2d61267b4c209f9aee3ef6ea2b
parent78b839007294b7c9e7fd0402801775283a4045bc (diff)
parent1971ef880ff225379d4a91f00f89f323a1605eeb (diff)
downloadpython-swiftclient-453544aece2f3bf272bc222ffcd9e60326cb1116.tar.gz
Merge "Make swiftclient respect region_name when using sessions"
-rw-r--r--swiftclient/client.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/swiftclient/client.py b/swiftclient/client.py
index ab0fde8..5961744 100644
--- a/swiftclient/client.py
+++ b/swiftclient/client.py
@@ -644,8 +644,10 @@ def get_auth(auth_url, user, key, **kwargs):
if session:
service_type = os_options.get('service_type', 'object-store')
interface = os_options.get('endpoint_type', 'public')
+ region_name = os_options.get('region_name')
storage_url = session.get_endpoint(service_type=service_type,
- interface=interface)
+ interface=interface,
+ region_name=region_name)
token = session.get_token()
elif auth_version in AUTH_VERSIONS_V1:
storage_url, token = get_auth_1_0(auth_url,