Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mitogen
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
nexedi
mitogen
Commits
88c198ea
Commit
88c198ea
authored
Mar 14, 2018
by
David Wilson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
issue #141: copy Ansible's connect_timeout for sudo too.
parent
63c3fc62
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
ansible_mitogen/connection.py
ansible_mitogen/connection.py
+4
-3
docs/ansible.rst
docs/ansible.rst
+1
-0
No files found.
ansible_mitogen/connection.py
View file @
88c198ea
...
...
@@ -73,7 +73,7 @@ class Connection(ansible.plugins.connection.ConnectionBase):
sudo_path
=
None
#: Set to 'ansible_ssh_timeout' by on_action_run().
connect
_timeout
=
None
ansible_ssh
_timeout
=
None
def
__init__
(
self
,
play_context
,
new_stdin
,
original_transport
):
assert
'MITOGEN_LISTENER_PATH'
in
os
.
environ
,
(
...
...
@@ -91,7 +91,7 @@ class Connection(ansible.plugins.connection.ConnectionBase):
executing. We use the opportunity to grab relevant bits from the
task-specific data.
"""
self
.
connect
_timeout
=
task_vars
.
get
(
self
.
ansible_ssh
_timeout
=
task_vars
.
get
(
'ansible_ssh_timeout'
,
None
)
...
...
@@ -135,7 +135,7 @@ class Connection(ansible.plugins.connection.ConnectionBase):
'python_path'
:
self
.
python_path
,
'identity_file'
:
self
.
_play_context
.
private_key_file
,
'ssh_path'
:
self
.
_play_context
.
ssh_executable
,
'connect_timeout'
:
self
.
connect
_timeout
,
'connect_timeout'
:
self
.
ansible_ssh
_timeout
,
'ssh_args'
:
[
term
for
s
in
(
...
...
@@ -166,6 +166,7 @@ class Connection(ansible.plugins.connection.ConnectionBase):
'password'
:
self
.
_play_context
.
password
,
'python_path'
:
python_path
or
self
.
python_path
,
'sudo_path'
:
self
.
sudo_path
,
'connect_timeout'
:
self
.
_play_context
.
timeout
,
'via'
:
via
,
'sudo_args'
:
shlex
.
split
(
self
.
_play_context
.
sudo_flags
or
...
...
docs/ansible.rst
View file @
88c198ea
...
...
@@ -253,6 +253,7 @@ Sudo Variables
* ansible_sudo_user, ansible_become_user (default: root)
* ansible_sudo_pass, ansible_become_pass (default: assume passwordless)
* sudo_flags, become_flags
* ansible.cfg: timeout
Chat on IRC
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment