openstack/tempest
Code Issues Proposed changes

Merge "Fix system & domain scoped admin dynamic credential"

Browse Source
This commit is contained in:
Zuul 2021-02-09 20:26:34 +00:00 committed by Gerrit Code Review
commit a7b734163c
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tempest/lib/common/dynamic_creds.py
View File

@ -376,15 +376,18 @@ class DynamicCredentialProvider(cred_provider.CredentialProvider):
elif scope and self._creds.get("%s_%s" % (scope, credential_type[0])):
credentials = self._creds["%s_%s" % (scope, credential_type[0])]
else:
if credential_type in ['primary', 'alt', 'admin']:
if scope:
if credential_type == 'admin':
credentials = self._create_creds(
admin=True, scope=scope)
else:
credentials = self._create_creds(
roles=credential_type, scope=scope)
elif credential_type in ['primary', 'alt', 'admin']:
is_admin = (credential_type == 'admin')
credentials = self._create_creds(admin=is_admin)
else:
if scope:
credentials = self._create_creds(
roles=credential_type, scope=scope)
else:
credentials = self._create_creds(roles=credential_type)
credentials = self._create_creds(roles=credential_type)
if scope:
self._creds["%s_%s" %
(scope, credential_type[0])] = credentials