wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #12107 from TravisPaul/devel

Browse source 
Update "smart" transport to handle Sun_SSH_1.5 on SmartOS
This commit is contained in:
James Cammarata 2015-08-28 10:43:48 -04:00
commit 266a069a73
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/executor/task_executor.py
View file

@ -452,7 +452,7 @@ class TaskExecutor:
try: try:
cmd = subprocess.Popen(['ssh','-o','ControlPersist'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) cmd = subprocess.Popen(['ssh','-o','ControlPersist'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
(out, err) = cmd.communicate() (out, err) = cmd.communicate()
if "Bad configuration option" in err: if "Bad configuration option" in err or "Usage:" in err:
conn_type = "paramiko" conn_type = "paramiko"
except OSError: except OSError:
conn_type = "paramiko" conn_type = "paramiko"