From 604f825a8e780d4e40448e5c299e87036d5dd637 Mon Sep 17 00:00:00 2001 From: Travis Paul Date: Wed, 26 Aug 2015 15:00:45 +0000 Subject: [PATCH] Update "smart" transport to handle Sun_SSH_1.5 on SmartOS --- lib/ansible/executor/task_executor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/ansible/executor/task_executor.py b/lib/ansible/executor/task_executor.py index 4b372cf4c7..f5a5a5000f 100644 --- a/lib/ansible/executor/task_executor.py +++ b/lib/ansible/executor/task_executor.py @@ -452,7 +452,7 @@ class TaskExecutor: try: cmd = subprocess.Popen(['ssh','-o','ControlPersist'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) (out, err) = cmd.communicate() - if "Bad configuration option" in err: + if "Bad configuration option" in err or "Usage:" in err: conn_type = "paramiko" except OSError: conn_type = "paramiko"