diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-01-18 22:53:18 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-01-18 22:53:18 +0000 |
commit | 089cb912a2e95cb658adec9e2e90d3a5574bd1cb (patch) | |
tree | 53b3f51c7b3e80c8869ae276e7d06c3310f4e758 | |
parent | fd218e922954a2d94bccd8d14efc3bbc7897675b (diff) | |
parent | 7256c4b5bf44a4da31c1f526fc0d5ea02de68011 (diff) | |
download | python-ceilometerclient-089cb912a2e95cb658adec9e2e90d3a5574bd1cb.tar.gz |
Merge "Adding default project and domain if nothing is specified"
-rw-r--r-- | ceilometerclient/client.py | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py index 7e4f1c0..9efd818 100644 --- a/ceilometerclient/client.py +++ b/ceilometerclient/client.py @@ -87,13 +87,21 @@ def _get_keystone_session(**kwargs): # create the keystone client session ks_session = session.Session(verify=verify, cert=cert, timeout=timeout) v2_auth_url, v3_auth_url = _discover_auth_versions(ks_session, auth_url) - username = kwargs.pop('username', None) user_id = kwargs.pop('user_id', None) user_domain_name = kwargs.pop('user_domain_name', None) user_domain_id = kwargs.pop('user_domain_id', None) project_domain_name = kwargs.pop('project_domain_name', None) project_domain_id = kwargs.pop('project_domain_id', None) + if v3_auth_url: + if not user_domain_id: + user_domain_id = 'default' + if not user_domain_name: + user_domain_name = 'default' + if not project_domain_id: + project_domain_id = 'default' + if not project_domain_name: + project_domain_name = 'default' auth = None use_domain = (user_domain_id or user_domain_name or |