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

__pillar__ can be a boolean, don't assume it's a dict.

Browse Source 
Fixes #26559
This commit is contained in:
Pedro Algarvio 2015-08-22 17:01:20 +01:00
parent b4e096a57b
commit 92c313b8f2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/grains/opts.py
View File

@ -9,6 +9,7 @@ def opts():
''' '''
Return the minion configuration settings Return the minion configuration settings
''' '''
if __opts__.get('grain_opts', False) or __pillar__.get('grain_opts', False): if __opts__.get('grain_opts', False) or \
(isinstance(__pillar__, dict) and __pillar__.get('grain_opts', False)):
return __opts__ return __opts__
return {} return {}