Commit 88c198ea authored by David Wilson's avatar David Wilson

issue #141: copy Ansible's connect_timeout for sudo too.

parent 63c3fc62
...@@ -73,7 +73,7 @@ class Connection(ansible.plugins.connection.ConnectionBase): ...@@ -73,7 +73,7 @@ class Connection(ansible.plugins.connection.ConnectionBase):
sudo_path = None sudo_path = None
#: Set to 'ansible_ssh_timeout' by on_action_run(). #: 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): def __init__(self, play_context, new_stdin, original_transport):
assert 'MITOGEN_LISTENER_PATH' in os.environ, ( assert 'MITOGEN_LISTENER_PATH' in os.environ, (
...@@ -91,7 +91,7 @@ class Connection(ansible.plugins.connection.ConnectionBase): ...@@ -91,7 +91,7 @@ class Connection(ansible.plugins.connection.ConnectionBase):
executing. We use the opportunity to grab relevant bits from the executing. We use the opportunity to grab relevant bits from the
task-specific data. task-specific data.
""" """
self.connect_timeout = task_vars.get( self.ansible_ssh_timeout = task_vars.get(
'ansible_ssh_timeout', 'ansible_ssh_timeout',
None None
) )
...@@ -135,7 +135,7 @@ class Connection(ansible.plugins.connection.ConnectionBase): ...@@ -135,7 +135,7 @@ class Connection(ansible.plugins.connection.ConnectionBase):
'python_path': self.python_path, 'python_path': self.python_path,
'identity_file': self._play_context.private_key_file, 'identity_file': self._play_context.private_key_file,
'ssh_path': self._play_context.ssh_executable, 'ssh_path': self._play_context.ssh_executable,
'connect_timeout': self.connect_timeout, 'connect_timeout': self.ansible_ssh_timeout,
'ssh_args': [ 'ssh_args': [
term term
for s in ( for s in (
...@@ -166,6 +166,7 @@ class Connection(ansible.plugins.connection.ConnectionBase): ...@@ -166,6 +166,7 @@ class Connection(ansible.plugins.connection.ConnectionBase):
'password': self._play_context.password, 'password': self._play_context.password,
'python_path': python_path or self.python_path, 'python_path': python_path or self.python_path,
'sudo_path': self.sudo_path, 'sudo_path': self.sudo_path,
'connect_timeout': self._play_context.timeout,
'via': via, 'via': via,
'sudo_args': shlex.split( 'sudo_args': shlex.split(
self._play_context.sudo_flags or self._play_context.sudo_flags or
......
...@@ -253,6 +253,7 @@ Sudo Variables ...@@ -253,6 +253,7 @@ Sudo Variables
* ansible_sudo_user, ansible_become_user (default: root) * ansible_sudo_user, ansible_become_user (default: root)
* ansible_sudo_pass, ansible_become_pass (default: assume passwordless) * ansible_sudo_pass, ansible_become_pass (default: assume passwordless)
* sudo_flags, become_flags * sudo_flags, become_flags
* ansible.cfg: timeout
Chat on IRC Chat on IRC
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment