AC-1191 Fix limit parameter on callback jobs to intersect with any limit specified on the job template.

This commit is contained in:
Chris Church
2014-04-14 23:40:06 -04:00
parent 55da67fa91
commit 1d417fe573
2 changed files with 7 additions and 2 deletions

View File

@@ -1224,7 +1224,7 @@ class JobTemplateCallback(GenericAPIView):
data = dict(msg='Cannot start automatically, user input required!')
# FIXME: Log!
return Response(data, status=status.HTTP_400_BAD_REQUEST)
limit = ':'.join(filter(None, [job_template.limit, host.name]))
limit = ':&'.join(filter(None, [job_template.limit, host.name]))
job = job_template.create_job(limit=limit, launch_type='callback')
result = job.signal_start()
if not result: