Fix passing the connection timeout to connection plugins (#71722)

* Fix passing the connection timeout to connection plugins
pull/71767/head
Sloane Hertel 4 years ago committed by GitHub
parent 5511c898cc
commit 7048542199
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -0,0 +1,2 @@
bugfixes:
- Pass the connection's timeout to connection plugins instead of the task's timeout.

@ -292,6 +292,8 @@ Ansible version 2.1 introduced the ``smart`` connection plugin. The ``smart`` co
To create a new connection plugin (for example, to support SNMP, Message bus, or other transports), copy the format of one of the existing connection plugins and drop it into ``connection`` directory on your :ref:`local plugin path <local_plugins>`.
Connection plugins can support common options (such as the ``--timeout`` flag) by defining an entry in the documentation for the attribute name (in this case ``timeout``). If the common option has a non-null default, the plugin should define the same default since a different default would be ignored.
For example connection plugins, see the source code for the `connection plugins included with Ansible Core <https://github.com/ansible/ansible/tree/devel/lib/ansible/plugins/connection>`_.
.. _developing_filter_plugins:

@ -933,6 +933,10 @@ class TaskExecutor:
task_keys = self._task.dump_attrs()
# The task_keys 'timeout' attr is the task's timeout, not the connection timeout.
# The connection timeout is threaded through the play_context for now.
task_keys['timeout'] = self._play_context.timeout
if self._play_context.password:
# The connection password is threaded through the play_context for
# now. This is something we ultimately want to avoid, but the first

Loading…
Cancel
Save