External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-08-04 20:10:01 -02:30
Code Issues Packages Projects Releases Wiki Activity

Implement timeout on job/job-template.

Browse Source
This commit is contained in:
Aaron Tan
2016-09-13 16:17:31 -04:00
parent 37139301b4
commit d52e237ea0
3 changed files with 33 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -143,6 +143,10 @@ class JobOptions(BaseModel):
allow_simultaneous = models.BooleanField(
default=False,
)
timeout = models.PositiveIntegerField(
blank=True,
default=0,
)
extra_vars_dict = VarsDictProperty('extra_vars', True)
@@ -253,7 +257,11 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, ResourceMixin):
'playbook', 'credential', 'cloud_credential', 'network_credential', 'forks', 'schedule',
'limit', 'verbosity', 'job_tags', 'extra_vars', 'launch_type',
'force_handlers', 'skip_tags', 'start_at_task', 'become_enabled',
<<<<<<< 887818cb8987d465e23f1ed0c5886473acdbfcda
'labels', 'survey_passwords', 'allow_simultaneous',]
=======
'labels', 'survey_passwords', 'timeout']
>>>>>>> Implement timeout on job/job-template.
def resource_validation_data(self):
'''