diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index af91ee58f2..b45595e6ac 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -254,6 +254,14 @@ START_TASK_LIMIT = 100 TASK_MANAGER_TIMEOUT = 300 TASK_MANAGER_TIMEOUT_GRACE_PERIOD = 60 +# Number of seconds _in addition to_ the task manager timeout a job can stay +# in waiting without being reaped +JOB_WAITING_GRACE_PERIOD = 60 + +# Number of seconds after a container group job finished time to wait +# before the awx_k8s_reaper task will tear down the pods +K8S_POD_REAPER_GRACE_PERIOD = 60 + # Disallow sending session cookies over insecure connections SESSION_COOKIE_SECURE = True @@ -1004,16 +1012,5 @@ DEFAULT_CONTAINER_RUN_OPTIONS = ['--network', 'slirp4netns:enable_ipv6=true'] # Mount exposed paths as hostPath resource in k8s/ocp AWX_MOUNT_ISOLATED_PATHS_ON_K8S = False -# Time out task managers if they take longer than this many seconds -TASK_MANAGER_TIMEOUT = 300 - -# Number of seconds _in addition to_ the task manager timeout a job can stay -# in waiting without being reaped -JOB_WAITING_GRACE_PERIOD = 60 - -# Number of seconds after a container group job finished time to wait -# before the awx_k8s_reaper task will tear down the pods -K8S_POD_REAPER_GRACE_PERIOD = 60 - # This is overridden downstream via /etc/tower/conf.d/cluster_host_id.py CLUSTER_HOST_ID = socket.gethostname()