valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Work around bug in salt-ssh in config.get for gpg renderer

Browse Source
This commit is contained in:
Colton Myers 2015-04-29 16:17:35 -06:00
parent 168508ec2a
commit d73979ee12
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: if not HAS_GPG:
raise SaltRenderError('GPG unavailable') raise SaltRenderError('GPG unavailable')
homedir = None
if 'config.get' in __salt__: if 'config.get' in __salt__:
homedir = __salt__['config.get']('gpg_keydir', DEFAULT_GPG_KEYDIR) homedir = __salt__['config.get']('gpg_keydir', None)
else: if homedir is None:
homedir = __opts__.get('gpg_keydir', DEFAULT_GPG_KEYDIR) homedir = __opts__.get('gpg_keydir', DEFAULT_GPG_KEYDIR)
log.debug('Reading GPG keys from: {0}'.format(homedir)) log.debug('Reading GPG keys from: {0}'.format(homedir))
try: try: