mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Merge pull request #12107 from TravisPaul/devel
Update "smart" transport to handle Sun_SSH_1.5 on SmartOS
This commit is contained in:
commit
266a069a73
1 changed files with 1 additions and 1 deletions
|
@ -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"
|
||||||
|
|
Loading…
Reference in a new issue