Revert "Allow including files through variables"

This reverts commit bf47bb4753.

Conflicts:

	lib/ansible/utils.py
	test/TestUtils.py
This commit is contained in:
Michael DeHaan 2012-09-19 10:30:02 -04:00
commit b8c4bb9e6e
9 changed files with 30 additions and 80 deletions

View file

@ -51,7 +51,7 @@ class ActionModule(object):
if 'first_available_file' in inject:
found = False
for fn in self.runner.module_vars.get('first_available_file'):
fn = utils.template(self.runner.basedir, fn, inject)
fn = utils.template(fn, inject)
if os.path.exists(fn):
source = fn
found = True
@ -60,7 +60,7 @@ class ActionModule(object):
result = dict(failed=True, msg="could not find src in first_available_file list")
return ReturnData(conn=conn, comm_ok=False, result=result)
source = utils.template(self.runner.basedir, source, inject)
source = utils.template(source, inject)
# template the source data locally & transfer
try: