x/vmware-nsx
Code Issues Proposed changes

Sync a change to rpc from openstack-common.

Browse Source 
This commit pulls in the following change from openstack-common:

    ee44222 Change the qpid_heartbeat default to 60 seconds.

Fix bug 1050661.

Change-Id: I2cb63d091f3d8a9a35d0e35ef18b70409c1f09ae
This commit is contained in:
Russell Bryant 2012-09-14 14:00:45 -04:00
parent 59fe9efa6c
commit 95894f2076
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/quantum.conf
View File

@ -115,7 +115,7 @@ control_exchange = quantum
# Equivalent to setting max and min to the same value
# qpid_reconnect_interval = 0
# Seconds between connection keepalive heartbeats
# qpid_heartbeat = 5
# qpid_heartbeat = 60
# Transport to use, either 'tcp' or 'ssl'
# qpid_protocol = tcp
# Disable Nagle algorithm

2
quantum/openstack/common/rpc/impl_qpid.py
View File

@ -69,7 +69,7 @@ qpid_opts = [
default=0,
help='Equivalent to setting max and min to the same value'),
cfg.IntOpt('qpid_heartbeat',
default=5,
default=60,
help='Seconds between connection keepalive heartbeats'),
cfg.StrOpt('qpid_protocol',
default='tcp',