summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-10 14:48:19 +0000
committerGerrit Code Review <review@openstack.org>2017-05-10 14:48:19 +0000
commitcb34c240b8af82687574d4f216356647d834bb4b (patch)
treee7feea3dec3f80334c7abce160f2fcb063ad92c7
parent3c62ce27f659392b04bd57a64223c6e47fd4adb0 (diff)
parent499be2f7586698d50ba0e9a82433c535f8017523 (diff)
downloadpython-ceilometerclient-cb34c240b8af82687574d4f216356647d834bb4b.tar.gz
Merge "[bugfix]with keystone v3 Could not find domain: default."
-rw-r--r--ceilometerclient/client.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/ceilometerclient/client.py b/ceilometerclient/client.py
index 17a75bc..8673e70 100644
--- a/ceilometerclient/client.py
+++ b/ceilometerclient/client.py
@@ -94,14 +94,10 @@ def _get_keystone_session(**kwargs):
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'
+ user_domain_name = 'Default'
if not project_domain_name:
- project_domain_name = 'default'
+ project_domain_name = 'Default'
auth = None
use_domain = (user_domain_id or user_domain_name or