openstack/deb-magnum
Code Issues Proposed changes

Make Docker client timeout configurable

Browse Source 
To support long running Docker operations we need to increase our
timeout, but a good value for the timeout will change per deployment.
So, add it as a config option so that it can be tweaked as necessary.

Change-Id: Ie53fa5086e73111bf9f42dbf596172af8d936cf0
Closes-Bug: #1450559
This commit is contained in:
Andrew Melton
2015-04-30 14:46:11 -07:00
parent 37b3149b5e
commit fa191a233a
5 changed files with 180 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
etc/magnum/magnum.conf.sample
View File

@@ -133,7 +133,7 @@
#rpc_zmq_bind_address = *
# MatchMaker driver. (string value)
#rpc_zmq_matchmaker = oslo_messaging._drivers.matchmaker.MatchMakerLocalhost
#rpc_zmq_matchmaker = local
# ZeroMQ receiver listening port. (integer value)
#rpc_zmq_port = 9501
@@ -383,6 +383,10 @@
# api version in your environment. (string value)
#docker_remote_api_version = 1.17
# Default timeout in seconds for docker client operations. (integer
# value)
#default_timeout = 10
# If set, ignore any SSL validation issues (boolean value)
#api_insecure = false
@@ -881,9 +885,10 @@
#rabbit_ha_queues = false
# Number of seconds after which the Rabbit broker is considered down
# if heartbeat's keep-alive fails (0 disable the heartbeat). (integer
# value)
#heartbeat_timeout_threshold = 60
# if heartbeat's keep-alive fails (0 disables the heartbeat, >0
# enables it. Enabling heartbeats requires kombu>=3.0.7 and
# amqp>=1.4.0). EXPERIMENTAL (integer value)
#heartbeat_timeout_threshold = 0
# How often times during the heartbeat_timeout_threshold we check the
# heartbeat. (integer value)