From c307e5e26f72e7567e4c6c916a04e281f65fe2a2 Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Fri, 14 Sep 2012 14:00:45 -0400 Subject: [PATCH] Sync a change to rpc from openstack-common. 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 --- etc/quantum.conf | 2 +- quantum/openstack/common/rpc/impl_qpid.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/quantum.conf b/etc/quantum.conf index d98f9c185..f6c265e92 100644 --- a/etc/quantum.conf +++ b/etc/quantum.conf @@ -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 diff --git a/quantum/openstack/common/rpc/impl_qpid.py b/quantum/openstack/common/rpc/impl_qpid.py index b222a8089..af8256463 100644 --- a/quantum/openstack/common/rpc/impl_qpid.py +++ b/quantum/openstack/common/rpc/impl_qpid.py @@ -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', -- 2.45.2