Merge pull request #4196 from jangsutsr/4137_add_ability_to_disable_global_job_timeout

Add ability to disable global job timeout
This commit is contained in:
Aaron Tan
2016-12-02 16:01:22 -05:00
committed by GitHub
5 changed files with 51 additions and 7 deletions

View File

@@ -859,7 +859,7 @@ class InventorySourceOptions(BaseModel):
default=False,
help_text=_('Overwrite local variables from remote inventory source.'),
)
timeout = models.PositiveIntegerField(
timeout = models.IntegerField(
blank=True,
default=0,
)
@@ -1309,4 +1309,3 @@ class CustomInventoryScript(CommonModelNameNotUnique, ResourceMixin):
def get_absolute_url(self):
return reverse('api:inventory_script_detail', args=(self.pk,))

View File

@@ -148,9 +148,9 @@ class JobOptions(BaseModel):
allow_simultaneous = models.BooleanField(
default=False,
)
timeout = models.PositiveIntegerField(
timeout = models.IntegerField(
blank=True,
default=0,
default=0,
)
extra_vars_dict = VarsDictProperty('extra_vars', True)

View File

@@ -106,7 +106,7 @@ class ProjectOptions(models.Model):
default=None,
on_delete=models.SET_NULL,
)
timeout = models.PositiveIntegerField(
timeout = models.IntegerField(
blank=True,
default=0,
)