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

Merge pull request #45149 from golmaal/develop

Browse Source 
#45147 - postgresql returner fails to connect to db when salt-ssh exe runs a command
This commit is contained in:
Nicole Thomas 2018-01-04 08:59:52 -05:00 committed by GitHub
commit 981b2cc0f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/returners/__init__.py
View File

@ -137,7 +137,7 @@ def _fetch_option(cfg, ret_config, virtualname, attr_name):
if not ret_config:
# Using the default configuration key
if isinstance(cfg, dict):
return c_cfg.get(attr_name, cfg.get(default_cfg_key))
return c_cfg.get(default_cfg_key, cfg.get(attr_name))
else:
return c_cfg.get(attr_name, cfg(default_cfg_key))