Merge pull request #1669 from dagwieers/ssh-tcgetattr2

Use proper pseudo-tty's instead of pipes when using subprocess

1 files changed, 13 insertions, 4 deletions

diff --git a/lib/ansible/runner/connection_plugins/ssh.py b/lib/ansible/runner/connection_plugins/ssh.py
index 5a33774bbc..1537f950c5 100644
--- a/lib/ansible/runner/connection_plugins/ssh.py
+++ b/lib/ansible/runner/connection_plugins/ssh.py
@@ -97,8 +97,17 @@ class Connection(object):
         ssh_cmd.append('/bin/sh -c ' + pipes.quote(cmd))
 
         vvv("EXEC %s" % ssh_cmd, host=self.host)
-        p = subprocess.Popen(ssh_cmd, stdin=subprocess.PIPE,
-                             stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+        try:
+            # Make sure stdin is a proper (pseudo) pty to avoid: tcgetattr errors
+            import pty
+            master, slave = pty.openpty()
+            p = subprocess.Popen(ssh_cmd, stdin=slave,
+                                 stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            stdin = os.fdopen(master, 'w', 0)
+        except:
+            p = subprocess.Popen(ssh_cmd, stdin=subprocess.PIPE,
+                                 stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+            stdin = p.stdin
 
         self._send_password()
 
@@ -117,7 +126,7 @@ class Connection(object):
                 else:
                     stdout = p.communicate()
                     raise errors.AnsibleError('ssh connection error waiting for sudo password prompt')
-            p.stdin.write(self.runner.sudo_pass + '\n')
+            stdin.write(self.runner.sudo_pass + '\n')
             fcntl.fcntl(p.stdout, fcntl.F_SETFL, fcntl.fcntl(p.stdout, fcntl.F_GETFL) & ~os.O_NONBLOCK)
 
         # We can't use p.communicate here because the ControlMaster may have stdout open as well
@@ -132,7 +141,7 @@ class Connection(object):
                     break
             elif p.poll() is not None:
                 break
-        p.stdin.close()  # close stdin after we read from stdout (see also issue #848)
+        stdin.close() # close stdin after we read from stdout (see also issue #848)
 
         if p.returncode != 0 and stdout.find('Bad configuration option: ControlPersist') != -1:
             raise errors.AnsibleError('using -c ssh on certain older ssh versions may not support ControlPersist, set ANSIBLE_SSH_ARGS="" (or ansible_ssh_args in the config file) before running again')