From d73979ee12303fc9958436b8b447363c3d31d414 Mon Sep 17 00:00:00 2001 From: Colton Myers Date: Wed, 29 Apr 2015 16:17:35 -0600 Subject: [PATCH] Work around bug in salt-ssh in config.get for gpg renderer --- salt/renderers/gpg.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/salt/renderers/gpg.py b/salt/renderers/gpg.py index 2054786925..ebd76df771 100644 --- a/salt/renderers/gpg.py +++ b/salt/renderers/gpg.py @@ -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: