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

diff --git a/etc/quantum.conf b/etc/quantum.conf
index d98f9c185177f8f955e108c2c99e3dd650e5bda6..f6c265e927a0f7e94691b47f77da2f8258e1711b 100644 (file)
--- 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 b222a8089e672610ac27aa857e0882c00063b379..af82564634bfc72f4c0082d1d5a87691747051ec 100644 (file)
--- 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',