saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #50090 from garethgreenaway/fix_vault_sdb_runner_test

Browse source 
[2018.3] Fix to utils/vault.py
This commit is contained in:
Nicole Thomas 2018-10-17 09:57:29 -04:00 • committed by GitHub
commit 05bd2a0692
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/utils/vault.py
View file

@ -123,8 +123,11 @@ def get_vault_connection():
raise salt.exceptions.CommandExecutionError(errmsg)
if 'vault' in __opts__ and __opts__.get('__role', 'minion') == 'master':
log.debug('Contacting master for Vault connection details')
return _get_token_and_url_from_master()
if 'id' in __grains__:
log.debug('Contacting master for Vault connection details')
return _get_token_and_url_from_master()
else:
return _use_local_config()
elif any((__opts__['local'], __opts__['file_client'] == 'local', __opts__['master_type'] == 'disable')):
return _use_local_config()
else: