cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fall back to paramiko if the smart detection fails to run ssh

Browse source 
Fixes #11695
This commit is contained in:
James Cammarata 2015-07-22 16:14:17 -04:00
parent dfcf6a2016
commit d412bc72ef
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -407,9 +407,12 @@ class TaskExecutor:
conn_type = "paramiko" conn_type = "paramiko"
else: else:
# see if SSH can support ControlPersist if not use paramiko # see if SSH can support ControlPersist if not use paramiko
cmd = subprocess.Popen(['ssh','-o','ControlPersist'], stdout=subprocess.PIPE, stderr=subprocess.PIPE) try:
(out, err) = cmd.communicate() cmd = subprocess.Popen(['ssh','-o','ControlPersist'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if "Bad configuration option" in err: (out, err) = cmd.communicate()
if "Bad configuration option" in err:
conn_type = "paramiko"
except OSError:
conn_type = "paramiko" conn_type = "paramiko"
connection = connection_loader.get(conn_type, self._play_context, self._new_stdin) connection = connection_loader.get(conn_type, self._play_context, self._new_stdin)