openstack
/
murano
Code Issues Proposed changes

Modify Default Domain 

From 2016/10, there is no domain with name 'Default' in keystone.
And the user would create a domain whith name 'default', like this:
https://docs.openstack.org/mitaka/install-guide-obs/keystone-users.html
If there is no domain_name in murano.conf, set the default domain with name
'default'.

Change-Id: I1aa9efe4119c586bd6fb6c9442560813530a5e9d
This commit is contained in:
Huangsm 2017-05-15 11:28:42 +08:00
parent f557af1873
commit 9ee24d9389
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
murano/common/auth_utils.py
View File

@ -32,11 +32,11 @@ def _get_keystone_auth(trust_id=None):
auth_uri = cfg.CONF['murano_auth'].auth_uri
username = cfg.CONF['murano_auth'].admin_user
password = cfg.CONF['murano_auth'].admin_password
user_domain_name = cfg.CONF['murano_auth'].user_domain_name or "Default"
user_domain_name = cfg.CONF['murano_auth'].user_domain_name or "default"
auth_type = cfg.CONF['murano_auth'].auth_type
project_name = cfg.CONF['murano_auth'].admin_project_name
project_domain_name = cfg.CONF['murano_auth'].project_domain_name or \
"Default"
"default"
if not (auth_uri and username and password):
versionutils.report_deprecated_feature(
LOG, "Please update configuration in 'murano_auth' group")