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 #31558 from cachedout/ensure_ssh_installed

Browse source 
Don't stacktrace if ssh binary is not installed with salt-ssh
This commit is contained in:
Mike Place 2016-02-29 15:15:44 -07:00
commit dbf6e0786c
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
salt/client/ssh/__init__.py
View file

@ -164,6 +164,8 @@ class SSH(object):
else:
self.event = None
self.opts = opts
if not salt.utils.which('ssh'):
raise salt.exceptions.SaltSystemExit('No ssh binary found in path -- ssh must be installed for salt-ssh to run. Exiting.')
self.opts['_ssh_version'] = ssh_version()
self.tgt_type = self.opts['selected_target_option'] \
if self.opts['selected_target_option'] else 'glob'