commit 45ebe9a4d01a349d15c821bed538d209bc362aed
author Jenkins <jenkins@review.openstack.org> Tue Apr 14 20:43:59 2015 +0000
committer Gerrit Code Review <review@openstack.org> Tue Apr 14 20:43:59 2015 +0000
tree 48b714574a00f0514cb99d67b57f65e4f2f55a56
parent c2c174a86351d3d5696ea3f0d0ddbffebf629413
parent 7cf7a8f88f05a6e6994dfb2ff3a6643d21c3048e

Merge "rpc: Allow to configure the rabbitmq heartbeat"

lib/rpc_backend

diff --git a/lib/rpc_backend b/lib/rpc_backend
index 2b7c6cb..288987c 100644
--- a/lib/rpc_backend
+++ b/lib/rpc_backend
@@ -273,6 +273,12 @@
         iniset $file oslo_messaging_rabbit rabbit_hosts $RABBIT_HOST
         iniset $file oslo_messaging_rabbit rabbit_password $RABBIT_PASSWORD
         iniset $file oslo_messaging_rabbit rabbit_userid $RABBIT_USERID
+        if [ -n "$RABBIT_HEARTBEAT_TIMEOUT_THRESHOLD" ]; then
+            iniset $file oslo_messaging_rabbit heartbeat_timeout_threshold $RABBIT_HEARTBEAT_TIMEOUT_THRESHOLD
+        fi
+        if [ -n "$RABBIT_HEARTBEAT_RATE" ]; then
+            iniset $file oslo_messaging_rabbit heartbeat_rate $RABBIT_HEARTBEAT_RATE
+        fi
     fi
 }