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

Do not sync grains in grains.setval when using local mode

Browse Source
This commit is contained in:
Ryan Lane 2014-12-03 16:55:38 -08:00
parent 8a8d8883c6
commit 8e2a9f886c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/grains.py
View File

@ -237,8 +237,9 @@ def setvals(grains, destructive=False):
except (IOError, OSError): except (IOError, OSError):
msg = 'Unable to write to cache file {0}. Check permissions.' msg = 'Unable to write to cache file {0}. Check permissions.'
log.error(msg.format(fn_)) log.error(msg.format(fn_))
# Sync the grains if not __opts__.get('local', False):
__salt__['saltutil.sync_grains']() # Sync the grains
__salt__['saltutil.sync_grains']()
# Return the grains we just set to confirm everything was OK # Return the grains we just set to confirm everything was OK
return new_grains return new_grains