Fix Murano client to use V3 and MultiDomain Authentication

This fix will going to allow the usage Murano client with V3 Authentication
and multidomain environments.

Based on the latest template of RC where is used os_user_domain_name
instead of os_project_domain_id or os_user_domain_id.

if this variables doesn't exists will going to use the old method that was
working on older versions.

Change-Id: I420a6d825fe228279fb21bcdd5c172c9fc6369f5
Closes-Bug: #1600181
This commit is contained in:
Jose Phillips 2016-12-20 01:40:47 -05:00
parent 46d1fb030b
commit 12c70b72d0
1 changed files with 7 additions and 4 deletions

View File

@ -397,10 +397,13 @@ class MuranoShell(object):
(v2_auth_url, v3_auth_url) = self._discover_auth_versions(
keystone_session, args.os_auth_url)
if v3_auth_url:
args.os_project_domain_id = (args.os_project_domain_id or
'default')
args.os_user_domain_id = (args.os_user_domain_id or
'default')
if (not args.os_user_domain_id and
not args.os_user_domain_name):
args.os_user_domain_id = 'default'
if (not args.os_project_domain_id and
not args.os_project_domain_name):
args.os_project_domain_id = 'default'
keystone_auth = AuthCLI.load_from_argparse_arguments(args)