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

Fix scan jobs not auto-starting inventory syncs

Browse Source 
Originally it would exclude any depdendies if inventory or project was none
This commit is contained in:
Matthew Jones
2016-06-06 12:30:38 -04:00
parent 7e7a611366
commit 936db91560
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/models/jobs.py
View File

@@ -635,14 +635,12 @@ class Job(UnifiedJob, JobOptions):
def generate_dependencies(self, active_tasks): def generate_dependencies(self, active_tasks):
from awx.main.models import InventoryUpdate, ProjectUpdate from awx.main.models import InventoryUpdate, ProjectUpdate
if self.inventory is None or self.project is None: inventory_sources = self.inventory.inventory_sources.filter(update_on_launch=True)
return []
inventory_sources = self.inventory.inventory_sources.filter( update_on_launch=True)
project_found = False project_found = False
inventory_sources_found = [] inventory_sources_found = []
dependencies = [] dependencies = []
for obj in active_tasks: for obj in active_tasks:
if type(obj) == ProjectUpdate: if type(obj) == ProjectUpdate and self.project is not None:
if obj.project == self.project: if obj.project == self.project:
project_found = True project_found = True
if type(obj) == InventoryUpdate: if type(obj) == InventoryUpdate:
@@ -660,7 +658,7 @@ class Job(UnifiedJob, JobOptions):
for source in inventory_sources.filter(pk__in=inventory_sources_already_updated): for source in inventory_sources.filter(pk__in=inventory_sources_already_updated):
if source not in inventory_sources_found: if source not in inventory_sources_found:
inventory_sources_found.append(source) inventory_sources_found.append(source)
if not project_found and self.project.needs_update_on_launch: if not project_found and self.project is not None and self.project.needs_update_on_launch:
dependencies.append(self.project.create_project_update(launch_type='dependency')) dependencies.append(self.project.create_project_update(launch_type='dependency'))
if inventory_sources.count(): # and not has_setup_failures? Probably handled as an error scenario in the task runner if inventory_sources.count(): # and not has_setup_failures? Probably handled as an error scenario in the task runner
for source in inventory_sources: for source in inventory_sources: