Commit d704b558 by Stephen Fromm

Support using paramiko to set up accelerate connection

Adds original_transport attribute to Runner to track what the original
transport was before it is changed to 'accelerate'.
If using paramiko in original_transport, uses ParamikoConnection.  If
not, falls back to SSHConnection like before.
parent 7b13b1e0
...@@ -185,6 +185,7 @@ class Runner(object): ...@@ -185,6 +185,7 @@ class Runner(object):
self.accelerate = accelerate self.accelerate = accelerate
self.accelerate_port = accelerate_port self.accelerate_port = accelerate_port
self.callbacks.runner = self self.callbacks.runner = self
self.original_transport = self.transport
if self.accelerate: if self.accelerate:
# if we're using accelerated mode, force the local # if we're using accelerated mode, force the local
......
...@@ -23,6 +23,7 @@ import struct ...@@ -23,6 +23,7 @@ import struct
import time import time
from ansible.callbacks import vvv from ansible.callbacks import vvv
from ansible.runner.connection_plugins.ssh import Connection as SSHConnection from ansible.runner.connection_plugins.ssh import Connection as SSHConnection
from ansible.runner.connection_plugins.paramiko_ssh import Connection as ParamikoConnection
from ansible import utils from ansible import utils
from ansible import errors from ansible import errors
from ansible import constants from ansible import constants
...@@ -49,14 +50,24 @@ class Connection(object): ...@@ -49,14 +50,24 @@ class Connection(object):
self.fbport = port[1] self.fbport = port[1]
self.is_connected = False self.is_connected = False
self.ssh = SSHConnection( if self.runner.original_transport == "paramiko":
runner=self.runner, self.ssh = ParamikoConnection(
host=self.host, runner=self.runner,
port=self.port, host=self.host,
user=self.user, port=self.port,
password=password, user=self.user,
private_key_file=private_key_file password=password,
) private_key_file=private_key_file
)
else:
self.ssh = SSHConnection(
runner=self.runner,
host=self.host,
port=self.port,
user=self.user,
password=password,
private_key_file=private_key_file
)
# attempt to work around shared-memory funness # attempt to work around shared-memory funness
if getattr(self.runner, 'aes_keys', None): if getattr(self.runner, 'aes_keys', None):
......
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