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

Update puppet.py

Browse source 
Update that fixes #28692 where puppet.noop results in an empty puppet run or when providing arguments to puppet.run without setting agent as the first argument results in an empty puppet run.
This commit is contained in:
mrosedale 2015-11-11 09:47:01 -05:00
parent d77c24e70d
commit c26ea916aa
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
salt/modules/puppet.py
View file

@ -156,17 +156,19 @@ def run(*args, **kwargs):
'''
_check_puppet()
puppet = _Puppet()
if args:
# new args tuple to filter out agent/apply for _Puppet.arguments()
buildargs = ()
for arg in range(len(args)):
# based on puppet documentation action must come first. making the same
# assertion. need to ensure the list of supported cmds here matches
# those defined in _Puppet.arguments()
if args[0] in ['agent', 'apply']:
puppet.subcmd = args[0]
puppet.arguments(args[1:])
else:
# args will exist as an empty list even if none have been provided
puppet.arguments(args)
if args[arg] in ['agent', 'apply']:
puppet.subcmd = args[arg]
else:
buildargs += (args[arg],)
# args will exist as an empty list even if none have been provided
puppet.arguments(buildargs)
puppet.kwargs.update(salt.utils.clean_kwargs(**kwargs))