openstack/python-ceilometerclient
Code Issues Proposed changes

Merge "[bugfix]with keystone v3 Could not find domain: default."

Browse Source
This commit is contained in:
Jenkins
2017-05-10 14:48:19 +00:00
committed by Gerrit Code Review
parent 3c62ce27f6 499be2f758
commit cb34c240b8
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ceilometerclient/client.py
View File

@@ -94,14 +94,10 @@ def _get_keystone_session(**kwargs):
project_domain_name = kwargs.pop('project_domain_name', None) project_domain_name = kwargs.pop('project_domain_name', None)
project_domain_id = kwargs.pop('project_domain_id', None) project_domain_id = kwargs.pop('project_domain_id', None)
if v3_auth_url: if v3_auth_url:
if not user_domain_id:
user_domain_id = 'default'
if not user_domain_name: if not user_domain_name:
user_domain_name = 'default' user_domain_name = 'Default'
if not project_domain_id:
project_domain_id = 'default'
if not project_domain_name: if not project_domain_name:
project_domain_name = 'default' project_domain_name = 'Default'
auth = None auth = None
use_domain = (user_domain_id or user_domain_name or use_domain = (user_domain_id or user_domain_name or