summaryrefslogtreecommitdiff
path: root/os_client_config/__init__.py
diff options
context:
space:
mode:
authorMonty Taylor <mordred@inaugust.com>2017-10-18 14:20:55 +0200
committerMonty Taylor <mordred@inaugust.com>2017-10-18 15:49:23 +0200
commit3e66722b292a4e8a81cee057d2259e3aa5916909 (patch)
treeede7f890b2270026eebb3fe6e10057faf9832976 /os_client_config/__init__.py
parent15834d7620498bff8561fc423acef8192d729b8f (diff)
downloados-client-config-3e66722b292a4e8a81cee057d2259e3aa5916909.tar.gz
Update make_rest_client to work with version discovery
Using make_rest_client on clouds that put unversioned endpoints in the catalog results in incorrectly set up adapters. Add the plumbing to get_session_client to pass version args to keystoneauth. Then use that from make_rest_client. Change-Id: I69ad746f672ef0b12680e9db3c7b0c691c9f87e4
Diffstat (limited to 'os_client_config/__init__.py')
-rw-r--r--os_client_config/__init__.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/os_client_config/__init__.py b/os_client_config/__init__.py
index 4246525..f5976b4 100644
--- a/os_client_config/__init__.py
+++ b/os_client_config/__init__.py
@@ -45,7 +45,7 @@ def get_config(
def make_rest_client(
service_key, options=None,
- app_name=None, app_version=None,
+ app_name=None, app_version=None, version=None,
**kwargs):
"""Simple wrapper function. It has almost no features.
@@ -63,7 +63,7 @@ def make_rest_client(
service_key=service_key, options=options,
app_name=app_name, app_version=app_version,
**kwargs)
- return cloud.get_session_client(service_key)
+ return cloud.get_session_client(service_key, version=version)
# Backwards compat - simple_client was a terrible name
simple_client = make_rest_client
# Backwards compat - session_client was a terrible name