ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-04-24 19:31:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

centralized the definition of 'localhost'

Browse source
This commit is contained in:
Brian Coca 2015-08-18 20:02:03 -04:00
parent 29724f359b
commit 961bee00d5
3 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,7 @@ import os.path
from ansible.plugins.action import ActionBase
from ansible.plugins import connection_loader
from ansible.utils.boolean import boolean
from ansible import constants
from ansible import constants as C
class ActionModule(ActionBase):
@ -46,7 +46,7 @@ class ActionModule(ActionBase):
def _process_origin(self, host, path, user):
if host not in ('127.0.0.1', 'localhost', '::1'):
if host not in C.LOCALHOST:
if user:
return '%s@%s:%s' % (user, host, path)
else:
@ -58,7 +58,7 @@ class ActionModule(ActionBase):
def _process_remote(self, host, path, user):
transport = self._play_context.connection
if host not in ('127.0.0.1', 'localhost', '::1') or transport != "local":
if host not in C.LOCALHOST or transport != "local":
if user:
return '%s@%s:%s' % (user, host, path)
else:
@ -115,11 +115,11 @@ class ActionModule(ActionBase):
src_host = '127.0.0.1'
dest_host = task_vars.get('ansible_ssh_host') or task_vars.get('inventory_hostname')
dest_is_local = dest_host in ('127.0.0.1', 'localhost', '::1')
dest_is_local = dest_host in C.LOCALHOST
# CHECK FOR NON-DEFAULT SSH PORT
if self._task.args.get('dest_port', None) is None:
inv_port = task_vars.get('ansible_ssh_port', None) or constants.DEFAULT_REMOTE_PORT
inv_port = task_vars.get('ansible_ssh_port', None) or C.DEFAULT_REMOTE_PORT
if inv_port is not None:
self._task.args['dest_port'] = inv_port
@ -218,7 +218,7 @@ class ActionModule(ActionBase):
self._task.args['rsync_path'] = '"%s"' % rsync_path
if use_ssh_args:
self._task.args['ssh_args'] = constants.ANSIBLE_SSH_ARGS
self._task.args['ssh_args'] = C.ANSIBLE_SSH_ARGS
# run the module and store the result
result = self._execute_module('synchronize', task_vars=task_vars)