From e453afa0643cadbcabfe5ad060f4455ec4efbf19 Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Mon, 23 Nov 2020 18:38:06 -0500 Subject: [PATCH] FOLLOW UP ON THIS: Fix fact_cache directory location The part where we pass in the runner params to the processor phase is legit. Need to investigate why the fact_cache directory is no longer nested under job.id. --- awx/main/tasks.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/awx/main/tasks.py b/awx/main/tasks.py index 74a414026c..f96050616b 100644 --- a/awx/main/tasks.py +++ b/awx/main/tasks.py @@ -1994,7 +1994,7 @@ class RunJob(BaseTask): return if job.use_fact_cache: job.finish_job_fact_cache( - os.path.join(private_data_dir, 'artifacts', str(job.id), 'fact_cache'), + os.path.join(private_data_dir, 'artifacts', 'fact_cache'), fact_modification_times, ) if isolated_manager_instance and not job.is_containerized: @@ -3201,7 +3201,8 @@ class AWXReceptorJob: _input=resultfile, event_handler=self.task.event_handler, finished_callback=self.task.finished_callback, - status_handler=self.task.status_handler) + status_handler=self.task.status_handler, + **self.runner_params) def cancel_watcher(self, processor_future): while True: