From 83e31b8618e9f0257a934d3536d3d699480495e8 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Mon, 31 Oct 2016 17:01:19 -0400 Subject: [PATCH] remove timeout settings example, attach minimum timeout values --- awx/main/conf.py | 3 +++ awx/settings/local_settings.py.docker_compose | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/awx/main/conf.py b/awx/main/conf.py index 2926c91359..2e26a6f1b5 100644 --- a/awx/main/conf.py +++ b/awx/main/conf.py @@ -177,6 +177,7 @@ register( register( 'DEFAULT_JOB_TIMEOUT', field_class=fields.IntegerField, + min_value=0, label=_('Default Job Timeout'), help_text=_('Maximum time to allow jobs to run. Use value of 0 to indicate that no ' 'timeout should be imposed. A timeout set on an individual job template will override this.'), @@ -187,6 +188,7 @@ register( register( 'DEFAULT_INVENTORY_UPDATE_TIMEOUT', field_class=fields.IntegerField, + min_value=0, label=_('Default Inventory Update Timeout'), help_text=_('Maximum time to allow inventory updates to run. Use value of 0 to indicate that no ' 'timeout should be imposed. A timeout set on an individual inventory source will override this.'), @@ -197,6 +199,7 @@ register( register( 'DEFAULT_PROJECT_UPDATE_TIMEOUT', field_class=fields.IntegerField, + min_value=0, label=_('Default Project Update Timeout'), help_text=_('Maximum time to allow inventory updates to run. Use value of 0 to indicate that no ' 'timeout should be imposed. A timeout set on an individual inventory source will override this.'), diff --git a/awx/settings/local_settings.py.docker_compose b/awx/settings/local_settings.py.docker_compose index 7a165570bc..540490c813 100644 --- a/awx/settings/local_settings.py.docker_compose +++ b/awx/settings/local_settings.py.docker_compose @@ -276,8 +276,3 @@ TEST_OPENSTACK_PROJECT = '' # Azure credentials. TEST_AZURE_USERNAME = '' TEST_AZURE_KEY_DATA = '' - -# Examples of global job timeout settings -# DEFAULT_JOB_TIMEOUT = 10 -# DEFAULT_INVENTORY_UPDATE_TIMEOUT = 15 -# DEFAULT_PROJECT_UPDATE_TIMEOUT = 20