External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-24 00:57:48 -02:30
Code Issues Packages Projects Releases Wiki Activity

Remove the logic blocking dependent inventory updates on callbacks

Browse Source
This commit is contained in:
Matthew Jones
2017-09-27 16:00:05 -04:00
parent a886747676
commit 7861cda6fe
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
awx/main/scheduler/task_manager.py
View File

@@ -390,17 +390,16 @@ class TaskManager():
dependencies.append(latest_project_update) dependencies.append(latest_project_update)
# Inventory created 2 seconds behind job # Inventory created 2 seconds behind job
if task.launch_type != 'callback': for inventory_source in [invsrc for invsrc in self.all_inventory_sources if invsrc.inventory == task.inventory]:
for inventory_source in [invsrc for invsrc in self.all_inventory_sources if invsrc.inventory == task.inventory]: if not inventory_source.update_on_launch:
if not inventory_source.update_on_launch: continue
continue latest_inventory_update = self.get_latest_inventory_update(inventory_source)
latest_inventory_update = self.get_latest_inventory_update(inventory_source) if self.should_update_inventory_source(task, latest_inventory_update):
if self.should_update_inventory_source(task, latest_inventory_update): inventory_task = self.create_inventory_update(task, inventory_source)
inventory_task = self.create_inventory_update(task, inventory_source) dependencies.append(inventory_task)
dependencies.append(inventory_task) else:
else: if latest_inventory_update.status in ['waiting', 'pending', 'running']:
if latest_inventory_update.status in ['waiting', 'pending', 'running']: dependencies.append(latest_inventory_update)
dependencies.append(latest_inventory_update)
if len(dependencies) > 0: if len(dependencies) > 0:
self.capture_chain_failure_dependencies(task, dependencies) self.capture_chain_failure_dependencies(task, dependencies)