saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

if grain is defined as None still convert in append

Browse source 
Fixes #40624
This commit is contained in:
Daniel Wallace 2017-04-11 09:45:16 -06:00
parent 05ac613ecf
commit b21bc7528f
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/states/grains.py
View file

@ -400,7 +400,7 @@ def append(name, value, convert=False,
'result': True,
'comment': ''}
grain = __salt__['grains.get'](name, None)
if grain:
if grain or name in __grains__:
if isinstance(grain, list):
if value in grain:
ret['comment'] = 'Value {1} is already in the list ' \
@ -425,7 +425,10 @@ def append(name, value, convert=False,
'added'.format(name, value)
ret['changes'] = {'added': value}
return ret
grain = [grain]
if grain is None:
grain = []
else:
grain = [grain]
grain.append(value)
__salt__['grains.setval'](name, grain)
ret['comment'] = 'Value {1} was added to grain {0}'\