summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2013-10-01 16:10:48 -0500
committerJames Cammarata <jimi@sngx.net>2013-10-07 13:20:23 -0500
commit3a48b820bb60f51a04d278abd810d66c60f37707 (patch)
tree64780c80742eb8692f26dac97da95f4985658e3d
parent6e5c7aef9fe78deced39743ae756a662f1a251c5 (diff)
downloadansible-3a48b820bb60f51a04d278abd810d66c60f37707.tar.gz
Drop default config value for accelerate timeout to 30 seconds
-rw-r--r--lib/ansible/constants.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ansible/constants.py b/lib/ansible/constants.py
index b529137fff..12e64fc8e9 100644
--- a/lib/ansible/constants.py
+++ b/lib/ansible/constants.py
@@ -134,7 +134,7 @@ ANSIBLE_SSH_CONTROL_PATH = get_config(p, 'ssh_connection', 'control_path',
PARAMIKO_RECORD_HOST_KEYS = get_config(p, 'paramiko_connection', 'record_host_keys', 'ANSIBLE_PARAMIKO_RECORD_HOST_KEYS', True, boolean=True)
ZEROMQ_PORT = get_config(p, 'fireball_connection', 'zeromq_port', 'ANSIBLE_ZEROMQ_PORT', 5099, integer=True)
ACCELERATE_PORT = get_config(p, 'accelerate', 'accelerate_port', 'ACCELERATE_PORT', 5099, integer=True)
-ACCELERATE_TIMEOUT = int(get_config(p, 'accelerate', 'accelerate_timeout', 'ACCELERATE_TIMEOUT', 300))
+ACCELERATE_TIMEOUT = int(get_config(p, 'accelerate', 'accelerate_timeout', 'ACCELERATE_TIMEOUT', 30))
ACCELERATE_CONNECT_TIMEOUT = float(get_config(p, 'accelerate', 'accelerate_connect_timeout', 'ACCELERATE_CONNECT_TIMEOUT', 1.0))
DEFAULT_UNDEFINED_VAR_BEHAVIOR = get_config(p, DEFAULTS, 'error_on_undefined_vars', 'ANSIBLE_ERROR_ON_UNDEFINED_VARS', True, boolean=True)