Merge pull request #11140 from RadishTheHut/connection_info

Fix for task_executor on OS X
pull/11146/head
Brian Coca 10 years ago
commit 74a537ede0

@ -380,7 +380,7 @@ class TaskExecutor:
conn_type = self._connection_info.connection conn_type = self._connection_info.connection
if conn_type == 'smart': if conn_type == 'smart':
conn_type = 'ssh' conn_type = 'ssh'
if sys.platform.startswith('darwin') and self._connection_info.remote_pass: if sys.platform.startswith('darwin') and self._connection_info.password:
# due to a current bug in sshpass on OSX, which can trigger # due to a current bug in sshpass on OSX, which can trigger
# a kernel panic even for non-privileged users, we revert to # a kernel panic even for non-privileged users, we revert to
# paramiko on that OS when a SSH password is specified # paramiko on that OS when a SSH password is specified

Loading…
Cancel
Save