Skip to content

A
ansible
Commit 604f825a by Travis Paul
Options

Update "smart" transport to handle Sun_SSH_1.5 on SmartOS

parent a3918570
Showing with 1 additions and 1 deletions
lib/ansible/executor/task_executor.py
...@@ -452,7 +452,7 @@ class TaskExecutor: ...@@ -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"
......
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