ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-08-04 05:04:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

avoid creating extra tmp dirs we don't delete

Browse source 
fixes #14867
This commit is contained in:
Brian Coca 2016-03-10 10:31:03 -05:00
commit 5cbdaff9fd
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lib/ansible/plugins/action/template.py
View file

@ -47,7 +47,7 @@ class ActionModule(ActionBase):
return dest_stat['checksum'] return dest_stat['checksum']
def run(self, tmp=None, task_vars=None): def run(self, tmp='', task_vars=None):
''' handler for template operations ''' ''' handler for template operations '''
if task_vars is None: if task_vars is None:
task_vars = dict() task_vars = dict()
@ -69,9 +69,6 @@ class ActionModule(ActionBase):
result['msg'] = "src and dest are required" result['msg'] = "src and dest are required"
return result return result
if tmp is None:
tmp = self._make_tmp_path()
if faf: if faf:
source = self._get_first_available_file(faf, task_vars.get('_original_file', None, 'templates')) source = self._get_first_available_file(faf, task_vars.get('_original_file', None, 'templates'))
if source is None: if source is None:
@ -178,8 +175,6 @@ class ActionModule(ActionBase):
if result.get('changed', False) and self._play_context.diff: if result.get('changed', False) and self._play_context.diff:
result['diff'] = diff result['diff'] = diff
return result
else: else:
# when running the file module based on the template data, we do # when running the file module based on the template data, we do
# not want the source filename (the name of the template) to be used, # not want the source filename (the name of the template) to be used,
@ -194,6 +189,6 @@ class ActionModule(ActionBase):
follow=True, follow=True,
), ),
) )
result.update(self._execute_module(module_name='file', module_args=new_module_args, task_vars=task_vars)) result.update(self._execute_module(module_name='file', module_args=new_module_args, task_vars=task_vars))
return result return result