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

Fix cmd_async to be just async

Browse Source
This commit is contained in:
Thomas S Hatch 2013-11-14 12:56:20 -07:00
parent ab8cc9b5fa
commit cef8320a7a
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
salt/master.py
View File

@ -2005,17 +2005,14 @@ class ClearFuncs(object):
''' '''
authorize = salt.auth.Authorize(self.opts, clear_load, self.loadauth) authorize = salt.auth.Authorize(self.opts, clear_load, self.loadauth)
if not authorize.rights('cloud', clear_load): if not authorize.rights('cloud', clear_load):
return False
try:
cloud_client = salt.cloud.CloudClient(
os.path.join(
os.path.dirname(self.opts['conf_file']), 'cloud'
)
)
fun = clear_load.pop('fun')
return cloud_client.cmd_async(fun, clear_load)
except Exception:
return '' return ''
cloud_client = salt.cloud.CloudClient(
os.path.join(
os.path.dirname(self.opts['conf_file']), 'cloud'
)
)
fun = clear_load.pop('fun')
return cloud_client.async(fun, clear_load)
def runner(self, clear_load): def runner(self, clear_load):
''' '''