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

grains state: changes comment more accurate

Browse Source
This commit is contained in:
Christophe Drevet-Droguet 2015-09-04 08:38:20 +02:00 committed by rallytime
parent 563fd2b56c
commit 1c5cd4c82d
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/states/grains.py
View File

@ -66,7 +66,7 @@ def present(name, value, delimiter=DEFAULT_TARGET_DELIM, force=False):
ret['changes'] = {'new': name}
else:
ret['comment'] = 'Grain {0} is set to be changed'.format(name)
ret['changes'] = {'new': name}
ret['changes'] = {'changed': {name: value}}
return ret
ret = __salt__['grains.set'](name, value, force=force)
if ret['result'] is True and ret['changes'] != {}:

2
tests/unit/states/grains_test.py
View File

@ -325,7 +325,7 @@ class GrainsTestCase(TestCase):
name='foo',
value='newbar')
self.assertEqual(ret['result'], None)
self.assertEqual(ret['changes'], {'new': 'foo'})
self.assertEqual(ret['changes'], {'changed': {'foo': 'newbar'}})
self.assertEqual(
grains.__grains__,
{'a': 'aval', 'foo': 'bar'})