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 #19211 from garethgreenaway/returner_with_profile_fix

Browse Source 
Fixes to returner __init__.py
This commit is contained in:
Thomas S Hatch 2014-12-28 13:01:39 -07:00
commit 7896ceeecd
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
salt/returners/__init__.py
View File

@ -198,13 +198,15 @@ def _fetch_profile_opts(
# Using a profile and it is in _options
creds = {}
profile = _options[profile_attr]
log.info('Using profile %s', profile)
if profile:
log.info('Using profile %s', profile)
if 'config.option' in __salt__:
creds = cfg(profile)
else:
creds = cfg.get(profile)
if 'config.option' in __salt__:
creds = cfg(profile)
else:
creds = cfg.get(profile)
if not creds:
return {}