External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-16 13:57:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

Simplify test branches

Browse Source
This commit is contained in:
Pierre-Louis Bonicoli
2020-03-11 17:22:43 +01:00
committed by Ryan Petrello
parent 9d85e8655d
commit 139384acc4
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/credential_plugins/hashivault.py
View File

@@ -111,10 +111,9 @@ def handle_auth(**kwargs):
if kwargs.get('token'): if kwargs.get('token'):
token = kwargs['token'] token = kwargs['token']
else: elif kwargs.get('role_id') and kwargs.get('secret_id'):
if kwargs.get('role_id') and kwargs.get('secret_id'):
token = approle_auth(**kwargs) token = approle_auth(**kwargs)
else: else:
raise Exception('Either Vault token or Auth parameters must be set') raise Exception('Either Vault token or Auth parameters must be set')
return token return token