valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removes stale code.

Browse Source 
Does nothing but remove deprecated code that is no longer in use.
This commit is contained in:
Mike Place 2014-05-13 13:20:50 -06:00
parent a74828f437
commit 75f1c00912
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/modules/publish.py
View File

@ -47,13 +47,11 @@ def _publish(
'''
if fun == 'publish.publish':
log.info('Function name is \'publish.publish\'. Returning {}')
# Need to log something here
return {}
arg = _normalize_arg(arg)
log.info('Publishing {0!r} to {master_uri}'.format(fun, **__opts__))
# sreq = salt.payload.SREQ(__opts__['master_uri'])
auth = salt.crypt.SAuth(__opts__)
tok = auth.gen_token('salt')
load = {'cmd': 'minion_pub',
@ -70,8 +68,6 @@ def _publish(
sreq = salt.transport.Channel.factory(__opts__)
try:
peer_data = sreq.send(load)
# peer_data = auth.crypticle.loads(
# sreq.send('aes', auth.crypticle.dumps(load), 1))
except SaltReqTimeoutError:
return '{0!r} publish timed out'.format(fun)
if not peer_data:
@ -83,8 +79,6 @@ def _publish(
'tok': tok,
'jid': peer_data['jid']}
ret = sreq.send(load)
# auth.crypticle.loads(
# sreq.send('aes', auth.crypticle.dumps(load), 5))
if form == 'clean':
cret = {}
for host in ret:
@ -216,7 +210,6 @@ def runner(fun, arg=None, timeout=5):
arg = _normalize_arg(arg)
log.info('Publishing runner {0!r} to {master_uri}'.format(fun, **__opts__))
# sreq = salt.payload.SREQ(__opts__['master_uri'])
auth = salt.crypt.SAuth(__opts__)
tok = auth.gen_token('salt')
load = {'cmd': 'minion_runner',
@ -229,7 +222,5 @@ def runner(fun, arg=None, timeout=5):
sreq = salt.transport.Channel.factory(__opts__)
try:
return sreq.send(load)
# return auth.crypticle.loads(
# sreq.send('aes', auth.crypticle.dumps(load), 1))
except SaltReqTimeoutError:
return '{0!r} runner publish timed out'.format(fun)