Add an internal param instructing synchronize to replace localhost with the host that's being ssh'd from

reviewable/pr18780/r1
Toshio Kuratomi 9 years ago
parent 55dcb52b52
commit d9e29752c1

@ -235,6 +235,27 @@ synchronize:
- "--no-motd" - "--no-motd"
- "--exclude=.git" - "--exclude=.git"
''' '''
client_addr = None
def substitute_controller(path):
global client_addr
if not client_addr:
ssh_env_string = os.environ.get('SSH_CLIENT', None)
try:
client_addr, _ = ssh_env_string.split(None, 1)
except AttributeError:
ssh_env_string = os.environ.get('SSH_CONNECTION', None)
try:
client_addr, _ = ssh_env_string.split(None, 1)
except AttributeError:
pass
if not client_addr:
raise ValueError
if path.startswith('localhost:'):
path = path.replace('localhost', client_addr, 1)
return path
def main(): def main():
@ -247,6 +268,7 @@ def main():
private_key = dict(default=None), private_key = dict(default=None),
rsync_path = dict(default=None), rsync_path = dict(default=None),
_local_rsync_path = dict(default='rsync', type='path'), _local_rsync_path = dict(default='rsync', type='path'),
_substitute_controller = dict(default='no', type='bool'),
archive = dict(default='yes', type='bool'), archive = dict(default='yes', type='bool'),
checksum = dict(default='no', type='bool'), checksum = dict(default='no', type='bool'),
compress = dict(default='yes', type='bool'), compress = dict(default='yes', type='bool'),
@ -270,6 +292,13 @@ def main():
supports_check_mode = True supports_check_mode = True
) )
if module.params['_substitute_controller']:
try:
source = '"' + substitute_controller(module.params['src']) + '"'
dest = '"' + substitute_controller(module.params['dest']) + '"'
except ValueError:
module.fail_json(msg='Could not determine controller hostname for rsync to send to')
else:
source = '"' + module.params['src'] + '"' source = '"' + module.params['src'] + '"'
dest = '"' + module.params['dest'] + '"' dest = '"' + module.params['dest'] + '"'
dest_port = module.params['dest_port'] dest_port = module.params['dest_port']

Loading…
Cancel
Save