Fixed: pathname for tmp

This commit is contained in:
alex 2012-07-02 22:04:56 +02:00
parent bbf2939063
commit f72b1f4fd7

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/tmp/.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')