(cherry picked from commit 7048542199
)
This commit is contained in:
parent
2327ef9da8
commit
198cffcb52
3 changed files with 8 additions and 0 deletions
|
@ -0,0 +1,2 @@
|
||||||
|
bugfixes:
|
||||||
|
- Pass the connection's timeout to connection plugins instead of the task's timeout.
|
|
@ -288,6 +288,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>`.
|
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>`_.
|
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:
|
.. _developing_filter_plugins:
|
||||||
|
|
|
@ -1014,6 +1014,10 @@ class TaskExecutor:
|
||||||
|
|
||||||
task_keys = self._task.dump_attrs()
|
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:
|
if self._play_context.password:
|
||||||
# The connection password is threaded through the play_context for
|
# The connection password is threaded through the play_context for
|
||||||
# now. This is something we ultimately want to avoid, but the first
|
# now. This is something we ultimately want to avoid, but the first
|
||||||
|
|
Loading…
Reference in a new issue