External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 19:51:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

clean up some isolated adhoc code

Browse Source 
if it's adhoc, there's not project directory to copy
This commit is contained in:
Ryan Petrello
2019-03-29 10:31:56 -04:00
parent 546281d435
commit d663d397f8
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/main/tasks.py
View File

@@ -1187,14 +1187,17 @@ class BaseTask(object):
if self.instance.is_isolated() is True: if self.instance.is_isolated() is True:
module_args = None module_args = None
if 'module_args' in params: if 'module_args' in params:
# if it's adhoc, copy the module args
module_args = ansible_runner.utils.args2cmdline( module_args = ansible_runner.utils.args2cmdline(
params.get('module_args'), params.get('module_args'),
) )
else:
# otherwise, it's a playbook, so copy the project dir
copy_tree(cwd, os.path.join(private_data_dir, 'project'))
shutil.move( shutil.move(
params.pop('inventory'), params.pop('inventory'),
os.path.join(private_data_dir, 'inventory') os.path.join(private_data_dir, 'inventory')
) )
copy_tree(cwd, os.path.join(private_data_dir, 'project'))
ansible_runner.utils.dump_artifacts(params) ansible_runner.utils.dump_artifacts(params)
manager_instance = isolated_manager.IsolatedManager( manager_instance = isolated_manager.IsolatedManager(
cancelled_callback=lambda: self.update_model(self.instance.pk).cancel_flag cancelled_callback=lambda: self.update_model(self.instance.pk).cancel_flag