diff options
author | Michael DeHaan <michael.dehaan@gmail.com> | 2012-04-20 07:54:38 -0400 |
---|---|---|
committer | Michael DeHaan <michael.dehaan@gmail.com> | 2012-04-20 07:54:38 -0400 |
commit | c6b8e1621dec9ca54f716a907437ba817f2beb75 (patch) | |
tree | 9eba4c34838a58692381b1e47c1c97eee5f32648 | |
parent | 13ba31231e38c45001a0b9b8a19964dd8249a647 (diff) | |
download | ansible-c6b8e1621dec9ca54f716a907437ba817f2beb75.tar.gz |
A better fix for slurp, expand path in the module.
-rwxr-xr-x | lib/ansible/runner.py | 3 | ||||
-rwxr-xr-x | library/slurp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/ansible/runner.py b/lib/ansible/runner.py index 323ebe7122..2a49b9bbfc 100755 --- a/lib/ansible/runner.py +++ b/lib/ansible/runner.py @@ -471,7 +471,8 @@ class Runner(object): if self.remote_user == 'root': metadata = '/etc/ansible/setup' else: - metadata = "/home/%s/.ansible/setup" % self.remote_user + # path is expanded on remote side + metadata = "~/.ansible/setup" # install the template module slurp_module = self._transfer_module(conn, tmp, 'slurp') diff --git a/library/slurp b/library/slurp index ab0c879db3..36e84ecc09 100755 --- a/library/slurp +++ b/library/slurp @@ -42,7 +42,7 @@ params = {} for x in items: (k, v) = x.split("=") params[k] = v -source = params['src'] +source = os.path.expanduser(params['src']) # ========================================== |