1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00

Merge pull request #526 from setsuna-/devel

Fixed: executing templates outside playbooks
This commit is contained in:
Michael DeHaan 2012-07-02 15:55:49 -07:00
commit 73c89bced0

View file

@ -269,13 +269,13 @@ class Runner(object):
if self.remote_user == 'root': if self.remote_user == 'root':
args = "%s metadata=/etc/ansible/setup" % args args = "%s metadata=/etc/ansible/setup" % args
else: else:
args = "%s metadata=%s/.ansible/setup" % (args, C.DEFAULT_REMOTE_TMP) args = "%s metadata=%s/setup" % (args, C.DEFAULT_REMOTE_TMP)
else: else:
if not 'metadata' in args: if not 'metadata' in args:
if self.remote_user == 'root': if self.remote_user == 'root':
args['metadata'] = '/etc/ansible/setup' args['metadata'] = '/etc/ansible/setup'
else: else:
args['metadata'] = "%s/.ansible/setup" % C.DEFAULT_REMOTE_TMP args['metadata'] = "%s/setup" % C.DEFAULT_REMOTE_TMP
return args return args
# ***************************************************** # *****************************************************
@ -567,7 +567,7 @@ class Runner(object):
metadata = '/etc/ansible/setup' metadata = '/etc/ansible/setup'
else: else:
# path is expanded on remote side # path is expanded on remote side
metadata = "~/.ansible/setup" metadata = "~/.ansible/tmp/setup"
# install the template module # install the template module
slurp_module = self._transfer_module(conn, tmp, 'slurp') slurp_module = self._transfer_module(conn, tmp, 'slurp')