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

Merge pull request #13147 from leedm777/connect-timeout

Browse source 
Increase the escalation prompt timeout
This commit is contained in:
Brian Coca 2015-11-13 10:45:01 -08:00
commit 49651221be
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/ansible/plugins/connection/ssh.py
View file

@ -392,7 +392,10 @@ class Connection(ConnectionBase):
become_error=False, become_nopasswd_error=False become_error=False, become_nopasswd_error=False
) )
timeout = self._play_context.timeout # select timeout should be longer than the connect timeout, otherwise
# they will race each other when we can't connect, and the connect
# timeout usually fails
timeout = 2 + self._play_context.timeout
rpipes = [p.stdout, p.stderr] rpipes = [p.stdout, p.stderr]
for fd in rpipes: for fd in rpipes:
fcntl.fcntl(fd, fcntl.F_SETFL, fcntl.fcntl(fd, fcntl.F_GETFL) | os.O_NONBLOCK) fcntl.fcntl(fd, fcntl.F_SETFL, fcntl.fcntl(fd, fcntl.F_GETFL) | os.O_NONBLOCK)