From 1dc3aa8ab1b6dfb3593578bcf0f99fd50876f21d Mon Sep 17 00:00:00 2001 From: Matthew Jones Date: Tue, 25 Mar 2014 16:20:27 -0400 Subject: [PATCH] Relax job dependency conflicts raised by customer support If both jobs are callbacks whose limits are different allow them to not conflict with each other when deciding launch dependencies --- awx/main/models/jobs.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index 4ad3a9c29d..fa9e16c1da 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -247,6 +247,9 @@ class Job(UnifiedJob, JobOptions): from awx.main.models import InventoryUpdate, ProjectUpdate if type(obj) == Job: if obj.job_template == self.job_template: + if obj.launch_type == 'callback' and self.launch_type == 'callback': + if obj.limit != self.limit: + return False return True return False if type(obj) == InventoryUpdate: