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

Merge pull request #15163 from ansible/synchronize-connection-vs-play_context

Browse source 
Use _connection instead of _play_context for information about the connection
This commit is contained in:
Toshio Kuratomi 2016-03-27 10:24:46 -07:00
parent c6c3fd79c2 e2f5762232
commit 0fffb6c60c
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/ansible/plugins/action/synchronize.py
View file

@ -80,7 +80,7 @@ class ActionModule(ActionBase):
is a different host (for instance, an ssh tunnelled port or an
alternative ssh port to a vagrant host.)
"""
transport = self._play_context.connection
transport = self._connection.transport
if host not in C.LOCALHOST or transport != "local":
if port_matches_localhost_port and host in C.LOCALHOST:
self._task.args['_substitute_controller'] = True
@ -143,13 +143,13 @@ class ActionModule(ActionBase):
result = super(ActionModule, self).run(tmp, task_vars)
# self._play_context.connection accounts for delegate_to so
# self._connection accounts for delegate_to so
# remote_transport is the transport ansible thought it would need
# between the controller and the delegate_to host or the controller
# and the remote_host if delegate_to isn't set.
remote_transport = False
if self._play_context.connection != 'local':
if self._connection.transport != 'local':
remote_transport = True
try:
@ -159,9 +159,9 @@ class ActionModule(ActionBase):
# ssh paramiko and local are fully supported transports. Anything
# else only works with delegate_to
if delegate_to is None and self._play_context.connection not in ('ssh', 'paramiko', 'smart', 'local'):
if delegate_to is None and self._connection.transport not in ('ssh', 'paramiko', 'local'):
result['failed'] = True
result['msg'] = "synchronize uses rsync to function. rsync needs to connect to the remote host via ssh or a direct filesystem copy. This remote host is being accessed via %s instead so it cannot work." % self._play_context.connection
result['msg'] = "synchronize uses rsync to function. rsync needs to connect to the remote host via ssh or a direct filesystem copy. This remote host is being accessed via %s instead so it cannot work." % self._connection.transport
return result
use_ssh_args = self._task.args.pop('use_ssh_args', None)