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 #23188 from basepi/salt-ssh.function.wrapper.gpg.19114

Browse source 
[2014.7] Work around bug in salt-ssh in config.get for gpg renderer
This commit is contained in:
Justin Findlay 2015-04-29 22:34:10 -06:00
commit 72fe88e5c6
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
salt/renderers/gpg.py
View file

@ -135,9 +135,10 @@ def render(gpg_data, saltenv='base', sls='', argline='', **kwargs):
'''
if not HAS_GPG:
raise SaltRenderError('GPG unavailable')
homedir = None
if 'config.get' in __salt__:
homedir = __salt__['config.get']('gpg_keydir', DEFAULT_GPG_KEYDIR)
else:
homedir = __salt__['config.get']('gpg_keydir', None)
if homedir is None:
homedir = __opts__.get('gpg_keydir', DEFAULT_GPG_KEYDIR)
log.debug('Reading GPG keys from: {0}'.format(homedir))
try: