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

Fix grains cache

Browse Source 
Prior to this, custom grains were not being cached at all.
This commit is contained in:
Mike Place 2016-01-26 16:37:55 -06:00
parent 30e03a8b0c
commit 52716694f5
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/loader.py
View File

@ -645,6 +645,7 @@ def grains(opts, force_refresh=False, proxy=None):
continue
grains_data.update(ret)
grains_data.update(opts['grains'])
# Write cache if enabled
if opts.get('grains_cache', False):
cumask = os.umask(0o77)
@ -664,7 +665,6 @@ def grains(opts, force_refresh=False, proxy=None):
log.error(msg.format(cfn))
os.umask(cumask)
grains_data.update(opts['grains'])
return grains_data