diff --git a/ansible_mitogen/plugins/connection/mitogen_ssh.py b/ansible_mitogen/plugins/connection/mitogen_ssh.py index d2af109c..dbaba407 100644 --- a/ansible_mitogen/plugins/connection/mitogen_ssh.py +++ b/ansible_mitogen/plugins/connection/mitogen_ssh.py @@ -42,6 +42,8 @@ DOCUMENTATION = """ options: """ +import ansible.plugins.connection.ssh + try: import ansible_mitogen.connection except ImportError: @@ -54,3 +56,10 @@ import ansible_mitogen.connection class Connection(ansible_mitogen.connection.Connection): 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) diff --git a/docs/changelog.rst b/docs/changelog.rst index d755875a..fea03073 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -185,6 +185,9 @@ Core Library 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. +* `#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 ``stderr`` write descriptors as non-blocking, causing subprocesses that 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 `_, `Colin McCarthy `_, `Dan Quackenbush `_, +`dsgnr `_, `Duane Zamrok `_, `falbanese `_, `Gonzalo Servat `_,