issue #342: forward _create_control_path() to SSH plugin.

network_cli connection type loads the "ssh" (mitogen_ssh) plugin and
expects a private method to exist.
pull/350/head
David Wilson 6 years ago
parent ed19e108d8
commit 2e3d04bbb8

@ -42,6 +42,8 @@ DOCUMENTATION = """
options: options:
""" """
import ansible.plugins.connection.ssh
try: try:
import ansible_mitogen.connection import ansible_mitogen.connection
except ImportError: except ImportError:
@ -54,3 +56,10 @@ import ansible_mitogen.connection
class Connection(ansible_mitogen.connection.Connection): class Connection(ansible_mitogen.connection.Connection):
transport = 'ssh' transport = 'ssh'
vanilla_class = ansible.plugins.connection.ssh.Connection
@staticmethod
def _create_control_path(*args, **kwargs):
"""Forward _create_control_path() to the implementation in ssh.py."""
# https://github.com/dw/mitogen/issues/342
return Connection.vanilla_class._create_control_path(*args, **kwargs)

@ -185,6 +185,9 @@ Core Library
could spuriously wake up due to ignoring an error bit set on events returned could spuriously wake up due to ignoring an error bit set on events returned
by the kernel, manifesting as a failure to read from an unrelated descriptor. by the kernel, manifesting as a failure to read from an unrelated descriptor.
* `#342 <https://github.com/dw/mitogen/issues/342>`_: The ``network_cli``
connection type would fail due to a missing internal SSH plugin method.
* Standard IO forwarding accidentally configured the replacement ``stdout`` and * Standard IO forwarding accidentally configured the replacement ``stdout`` and
``stderr`` write descriptors as non-blocking, causing subprocesses that ``stderr`` write descriptors as non-blocking, causing subprocesses that
generate more output than kernel buffer space existed to throw errors. The generate more output than kernel buffer space existed to throw errors. The
@ -210,6 +213,7 @@ the bug reports and pull requests in this release contributed by
`Ayaz Ahmed Khan <https://github.com/ayaz>`_, `Ayaz Ahmed Khan <https://github.com/ayaz>`_,
`Colin McCarthy <https://github.com/colin-mccarthy>`_, `Colin McCarthy <https://github.com/colin-mccarthy>`_,
`Dan Quackenbush <https://github.com/danquack>`_, `Dan Quackenbush <https://github.com/danquack>`_,
`dsgnr <https://github.com/dsgnr>`_,
`Duane Zamrok <https://github.com/dewthefifth>`_, `Duane Zamrok <https://github.com/dewthefifth>`_,
`falbanese <https://github.com/falbanese>`_, `falbanese <https://github.com/falbanese>`_,
`Gonzalo Servat <https://github.com/gservat>`_, `Gonzalo Servat <https://github.com/gservat>`_,

Loading…
Cancel
Save