openstack/deb-murano
Code Issues Proposed changes

Updated *_domain_id to "Default"

Browse Source 
Previously user_domain_id and project_domain_id was hardcoded to
"default" which causes an error in environments using PostgreSQL or
case-sensirive MySQL as DB backend.

Change-Id: Id8489ad712deebff2248fbf404df255f484a8071
Closes-Bug: #1580611
This commit is contained in:
Nikolay Starodubtsev 2016-06-02 13:57:18 +03:00 committed by Kirill Zaitsev
parent 822a312c3a
commit cae7e61787
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

@ -29,12 +29,12 @@ def _get_keystone_admin_parameters(scoped):
'auth_url': cfg.CONF.keystone_authtoken.auth_uri.replace('v2.0', 'v3'), 'auth_url': cfg.CONF.keystone_authtoken.auth_uri.replace('v2.0', 'v3'),
'username': cfg.CONF.keystone_authtoken.admin_user, 'username': cfg.CONF.keystone_authtoken.admin_user,
'password': cfg.CONF.keystone_authtoken.admin_password, 'password': cfg.CONF.keystone_authtoken.admin_password,
'user_domain_name': 'default' 'user_domain_name': "Default"
} }
if scoped: if scoped:
settings.update({ settings.update({
'project_name': cfg.CONF.keystone_authtoken.admin_tenant_name, 'project_name': cfg.CONF.keystone_authtoken.admin_tenant_name,
'project_domain_name': 'default' 'project_domain_name': "Default"
}) })
return settings return settings