Skip to content

add kwargs to be passed from grains.setval to saltutil.refresh_grains #56020

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
jtraub91 wants to merge 1 commit into from
Closed

add kwargs to be passed from grains.setval to saltutil.refresh_grains #56020

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions salt/modules/grains.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ def item(*args, **kwargs):
return ret


def setvals(grains, destructive=False):
def setvals(grains, destructive=False, **kwargs):
'''
Set new grains values in the grains config file

Expand Down Expand Up @@ -305,12 +305,12 @@ def setvals(grains, destructive=False):
)
if not __opts__.get('local', False):
# Refresh the grains
__salt__['saltutil.refresh_grains']()
__salt__['saltutil.refresh_grains'](**kwargs)
# Return the grains we just set to confirm everything was OK
return new_grains


def setval(key, val, destructive=False):
def setval(key, val, destructive=False, **kwargs):
'''
Set a grains value in the grains config file

Expand All @@ -331,7 +331,7 @@ def setval(key, val, destructive=False):
salt '*' grains.setval key val
salt '*' grains.setval key "{'sub-key': 'val', 'sub-key2': 'val2'}"
'''
return setvals({key: val}, destructive)
return setvals({key: val}, destructive, **kwargs)


def append(key, val, convert=False, delimiter=DEFAULT_TARGET_DELIM):
Expand Down