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

Fix synchronize module incorrect remote host processing. (#15993)

Browse source 
Fixes  #15539
(cherry picked from commit 9753cac530)
This commit is contained in:
Sergei Smolianinov 2016-06-15 03:37:26 +04:00 committed by James Cammarata
parent 75beca22a5
commit 304493e795
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -85,7 +85,8 @@ class ActionModule(ActionBase):
alternative ssh port to a vagrant host.) alternative ssh port to a vagrant host.)
""" """
transport = self._connection.transport transport = self._connection.transport
if host not in C.LOCALHOST or transport != "local": if host not in C.LOCALHOST or transport != "local" or \
(host in C.LOCALHOST and not port_matches_localhost_port):
if port_matches_localhost_port and host in C.LOCALHOST: if port_matches_localhost_port and host in C.LOCALHOST:
self._task.args['_substitute_controller'] = True self._task.args['_substitute_controller'] = True
return self._format_rsync_rsh_target(host, path, user) return self._format_rsync_rsh_target(host, path, user)