cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fixed first_available_file and roles support

Browse source 
for copy and template action
This commit is contained in:
Peter Hudec 2013-06-03 22:47:50 +02:00
parent 48e13f5c6d
commit e8ff3c43ad
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/ansible/runner/action_plugins/copy.py
View file

@ -57,12 +57,12 @@ class ActionModule(object):
found = False found = False
for fn in inject.get('first_available_file'): for fn in inject.get('first_available_file'):
fn_orig = fn fn_orig = fn
fn = template.template(self.runner.basedir, fn, inject) fnt = template.template(self.runner.basedir, fn, inject)
fn = utils.path_dwim(self.runner.basedir, fn) fnd = utils.path_dwim(self.runner.basedir, fnt)
if not os.path.exists(fn) and '_original_file' in inject: if not os.path.exists(fnd) and '_original_file' in inject:
fn = utils.path_dwim_relative(inject['_original_file'], 'files', fn_orig, self.runner.basedir, check=False) fnd = utils.path_dwim_relative(inject['_original_file'], 'files', fnt, self.runner.basedir, check=False)
if os.path.exists(fn): if os.path.exists(fnd):
source = fn source = fnd
found = True found = True
break break
if not found: if not found:

2
lib/ansible/runner/action_plugins/template.py
View file

@ -60,7 +60,7 @@ class ActionModule(object):
fnt = template.template(self.runner.basedir, fn, inject) fnt = template.template(self.runner.basedir, fn, inject)
fnd = utils.path_dwim(self.runner.basedir, fnt) fnd = utils.path_dwim(self.runner.basedir, fnt)
if not os.path.exists(fnd) and '_original_file' in inject: if not os.path.exists(fnd) and '_original_file' in inject:
fnd = utils.path_dwim_relative(inject['_original_file'], 'templates', fn_orig, self.runner.basedir, check=False) fnd = utils.path_dwim_relative(inject['_original_file'], 'templates', fnt, self.runner.basedir, check=False)
if os.path.exists(fnd): if os.path.exists(fnd):
source = fnd source = fnd
found = True found = True