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

Merge pull request #496 from davehatton/fix_stderr

Browse source 
change STDOUT to PIPE  to get ssh connection module working
This commit is contained in:
Michael DeHaan 2012-06-21 06:00:07 -07:00
commit b32b5a0620
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/runner/connection/ssh.py
View file

@ -76,7 +76,7 @@ class SSHConnection(object):
sudo_output = ''
ssh_cmd.append(sudocmd)
p = subprocess.Popen(ssh_cmd, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
if self.runner.sudo_pass:
fcntl.fcntl(p.stdout, fcntl.F_SETFL,
fcntl.fcntl(p.stdout, fcntl.F_GETFL) | os.O_NONBLOCK)
@ -96,7 +96,7 @@ class SSHConnection(object):
else:
ssh_cmd.append(cmd)
p = subprocess.Popen(ssh_cmd, stdin=subprocess.PIPE,
stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
stdout=subprocess.PIPE, stderr=subprocess.PIPE)
# We can't use p.communicate here because the ControlMaster may have stdout open as well
p.stdin.close()