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

what was I thinking?

Browse source
This commit is contained in:
C. R. Oldham 2015-10-08 07:03:47 -06:00
parent ccf366e1a5
commit 62d9f5092e
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/modules/test.py
View file

@ -110,13 +110,8 @@ def ping():
salt '*' test.ping
'''
ping_cmd = __opts__['proxy']['proxytype'] + '.ping'
if salt.utils.is_proxy():
if __opts__.get('add_proxymodule_to_opts', False):
return __opts__['proxymodule'][ping_cmd]()
else:
return __proxy__[ping_cmd]()
else:
if not salt.utils.is_proxy():
return True
else:
ping_cmd = __opts__['proxy']['proxytype'] + '.ping'