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

Comments and Changes output fixes

Browse Source 
Changes returns a dict with deleted key and list of values.
Improved newline handling for comment output
This commit is contained in:
Brian Stevenson 2016-03-22 18:09:11 -07:00
parent b98f5517de
commit e48593ed81
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
salt/states/grains.py
View File

@ -172,6 +172,7 @@ def list_absent(name, value):
'changes': {},
'result': True,
'comment': ''}
comments = []
grain = __grains__.get(name)
if grain:
if isinstance(grain, list):
@ -179,23 +180,28 @@ def list_absent(name, value):
value = [value]
for val in value:
if val not in grain:
ret['comment'] += ('\nValue {1} is absent from '
'grain {0}'.format(name, val))
comments.append('Value {1} is absent from '
'grain {0}'.format(name, val))
elif __opts__['test']:
ret['result'] = None
ret['comment'] += ('\nValue {1} in grain {0} is set '
'to be deleted'.format(name, val))
ret['changes'][val] = 'deleted'
comments.append('Value {1} in grain {0} is set '
'to be deleted'.format(name, val))
if not ret['changes'].has_key('deleted'):
ret['changes'] = {'deleted': []}
ret['changes']['deleted'].append(val)
elif val in grain:
__salt__['grains.remove'](name, val)
ret['comment'] += ('\nValue {1} was deleted from '
'grain {0}'.format(name, val))
ret['changes'][val] = 'deleted'
comments.append('Value {1} was deleted from '
'grain {0}'.format(name, val))
if not ret['changes'].has_key('deleted'):
ret['changes'] = {'deleted': []}
ret['changes']['deleted'].append(val)
ret['comment'] = '\n'.join(comments)
return ret
else:
ret['result'] = False
ret['comment'] = 'Grain {0} is not a valid list'\
.format(name)
.format(name)
else:
ret['comment'] = 'Grain {0} does not exist'.format(name)
return ret