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

Merge pull request #14901 from Nibbler999/fix-custom-grains-override

Browse Source 
Fix custom grains override
This commit is contained in:
Thomas S Hatch 2014-08-13 10:35:26 -06:00
commit 80a7c85b03
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
salt/loader.py
View File

@ -1206,7 +1206,14 @@ class Loader(object):
grains_data = {} grains_data = {}
funcs = self.gen_functions() funcs = self.gen_functions()
for key, fun in funcs.items(): for key, fun in funcs.items():
if key[key.index('.') + 1:] == 'core': if not key.startswith('core.'):
continue
ret = fun()
if not isinstance(ret, dict):
continue
grains_data.update(ret)
for key, fun in funcs.items():
if key.startswith('core.'):
continue continue
try: try:
ret = fun() ret = fun()
@ -1222,13 +1229,6 @@ class Loader(object):
if not isinstance(ret, dict): if not isinstance(ret, dict):
continue continue
grains_data.update(ret) grains_data.update(ret)
for key, fun in funcs.items():
if key[key.index('.') + 1:] != 'core':
continue
ret = fun()
if not isinstance(ret, dict):
continue
grains_data.update(ret)
# Write cache if enabled # Write cache if enabled
if self.opts.get('grains_cache', False): if self.opts.get('grains_cache', False):
cumask = os.umask(077) cumask = os.umask(077)