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

Remove grains outputter from grains modules

Browse Source 
Since we have removed the grains outputter (#20172) we should stop trying to talk to it
This commit is contained in:
Thomas Jackson 2015-04-07 18:17:04 -07:00
parent 5d8a4d7ab7
commit 2ca422d967
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/client/ssh/wrapper/grains.py
View File

@ -16,13 +16,6 @@ from salt.exceptions import SaltException
# Seed the grains dict so cython will build
__grains__ = {}
# Change the default outputter to make it more readable
__outputter__ = {
'items': 'grains',
'item': 'grains',
'setval': 'grains',
}
def _serial_sanitizer(instr):
'''Replaces the last 1/4 of a string with X's'''

7
salt/modules/grains.py
View File

@ -28,13 +28,6 @@ __proxyenabled__ = ['*']
# Seed the grains dict so cython will build
__grains__ = {}
# Change the default outputter to make it more readable
__outputter__ = {
'items': 'grains',
'item': 'grains',
'setval': 'grains',
}
# http://stackoverflow.com/a/12414913/127816
_infinitedict = lambda: collections.defaultdict(_infinitedict)