Commit 6af5455e by James Cammarata

Default 'smart' connection to paramiko for OSX platforms

Due to the long-standing bug in sshpass, which can crash OSX.

Fixes #5007
parent cdcbde1c
...@@ -214,14 +214,18 @@ class Runner(object): ...@@ -214,14 +214,18 @@ class Runner(object):
self.run_once = run_once self.run_once = run_once
if self.transport == 'smart': if self.transport == 'smart':
# if the transport is 'smart' see if SSH can support ControlPersist if not use paramiko # If the transport is 'smart', check to see if certain conditions
# would prevent us from using ssh, and fallback to paramiko.
# 'smart' is the default since 1.2.1/1.3 # 'smart' is the default since 1.2.1/1.3
cmd = subprocess.Popen(['ssh','-o','ControlPersist'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) self.transport = "ssh"
(out, err) = cmd.communicate() if sys.platform.startswith('darwin'):
if "Bad configuration option" in err:
self.transport = "paramiko" self.transport = "paramiko"
else: else:
self.transport = "ssh" # see if SSH can support ControlPersist if not use paramiko
cmd = subprocess.Popen(['ssh','-o','ControlPersist'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
(out, err) = cmd.communicate()
if "Bad configuration option" in err:
self.transport = "paramiko"
# save the original transport, in case it gets # save the original transport, in case it gets
# changed later via options like accelerate # changed later via options like accelerate
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment