valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Partially revert #19912

Browse Source
This commit is contained in:
Colton Myers 2015-01-23 16:41:15 -07:00
parent 55cb7fdab1
commit e3b471d0e8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/renderers/gpg.py
View File

@ -133,7 +133,10 @@ def render(data, saltenv='base', sls='', argline='', **kwargs):
'''
if not HAS_GPG:
raise SaltRenderError('GPG unavailable')
homedir = __salt__['config.get']('gpg_keydir', DEFAULT_GPG_KEYDIR)
if 'config.get' in __salt__:
homedir = __salt__['config.get']('gpg_keydir', DEFAULT_GPG_KEYDIR)
else:
homedir = __opts__.get('gpg_keydir', DEFAULT_GPG_KEYDIR)
log.debug('Reading GPG keys from: {0}'.format(homedir))
gpg = gnupg.GPG(gnupghome=homedir)
return decrypt_object(data, gpg)