summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-09-23 19:21:10 +0000
committerGerrit Code Review <review@openstack.org>2013-09-23 19:21:10 +0000
commit2610d6c144e0d81cd94a6f18eb899443ce7d64fb (patch)
treee3822a267fad0177f7fc666c91c06b6351374d5f
parent05e435542b5f42899accad1bbe232139e79cfaff (diff)
parent56165637f84681f18f81d1e6afbcd8957c097f22 (diff)
downloadpython-ceilometerclient-2610d6c144e0d81cd94a6f18eb899443ce7d64fb.tar.gz
Merge "Pass region_name argument to keystone client"1.0.5
-rw-r--r--ceilometerclient/client.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py
index 7488479..c65c214 100644
--- a/ceilometerclient/client.py
+++ b/ceilometerclient/client.py
@@ -29,6 +29,7 @@ def _get_ksclient(**kwargs):
tenant_id=kwargs.get('tenant_id'),
tenant_name=kwargs.get('tenant_name'),
auth_url=kwargs.get('auth_url'),
+ region_name=kwargs.get('region_name'),
insecure=kwargs.get('insecure'))
@@ -68,6 +69,7 @@ def get_client(api_version, **kwargs):
'tenant_id': kwargs.get('os_tenant_id'),
'tenant_name': kwargs.get('os_tenant_name'),
'auth_url': kwargs.get('os_auth_url'),
+ 'region_name': kwargs.get('os_region_name'),
'service_type': kwargs.get('os_service_type'),
'endpoint_type': kwargs.get('os_endpoint_type'),
'insecure': kwargs.get('insecure'),