cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'issue4022' of https://github.com/sfromm/ansible into sfromm-issue4022

Browse source 
Conflicts:
	lib/ansible/runner/connection_plugins/accelerate.py
This commit is contained in:
James Cammarata 2013-09-16 05:50:35 -05:00
commit 3848e02959
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/ansible/runner/__init__.py
View file

@ -180,6 +180,7 @@ class Runner(object):
self.accelerate = accelerate
self.accelerate_port = accelerate_port
self.callbacks.runner = self
self.original_transport = self.transport
if self.transport == 'smart':
# if the transport is 'smart' see if SSH can support ControlPersist if not use paramiko

27
lib/ansible/runner/connection_plugins/accelerate.py
View file

@ -23,6 +23,7 @@ import struct
import time
from ansible.callbacks import vvv
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 errors
from ansible import constants
@ -59,14 +60,24 @@ class Connection(object):
elif not isinstance(self.accport, int):
self.accport = int(self.accport)
self.ssh = SSHConnection(
runner=self.runner,
host=self.host,
port=self.port,
user=self.user,
password=password,
private_key_file=private_key_file
)
if self.runner.original_transport == "paramiko":
self.ssh = ParamikoConnection(
runner=self.runner,
host=self.host,
port=self.port,
user=self.user,
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
if getattr(self.runner, 'aes_keys', None):