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

Merge pull request #30293 from cro/proxy_log_cleanup

Browse source 
Ensure we don't log stuff we shouldn't
This commit is contained in:
Mike Place 2016-01-12 11:04:25 -07:00
commit 75b83453cf
2 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
salt/modules/cmdmod.py
View file

@ -588,10 +588,17 @@ def _run_all_quiet(cmd,
reset_system_locale=True,
saltenv='base',
pillarenv=None,
pillar_override=None):
pillar_override=None,
output_loglevel=None):
'''
Helper for running commands quietly for minion startup.
Returns a dict of return data
Returns a dict of return data.
output_loglevel argument is ignored. This is here for when we alias
cmd.run_all directly to _run_all_quiet in certain chicken-and-egg
situations where modules need to work both before and after
the __salt__ dictionary is populated (cf dracr.py)
'''
return _run(cmd,
runas=runas,

6
salt/modules/dracr.py
View file

@ -90,7 +90,8 @@ def __execute_cmd(command, host=None,
admin_username,
admin_password,
command,
modswitch))
modswitch),
output_loglevel='quiet')
if cmd['retcode'] != 0:
log.warning('racadm return an exit code \'{0}\'.'
@ -123,7 +124,8 @@ def __execute_ret(command, host=None,
admin_username,
admin_password,
command,
modswitch))
modswitch),
output_loglevel='quiet')
if cmd['retcode'] != 0:
log.warning('racadm return an exit code \'{0}\'.'