From ddfcbc64fcb54f24ee1b45505a571dd271f1ea91 Mon Sep 17 00:00:00 2001 From: ZhiQiang Fan Date: Thu, 9 Jul 2015 03:42:32 -0700 Subject: [PATCH] Update sample config file The options defined in oslo.messaging has been updated, but our stable branch still reference to the old one, which may confuse end users, this patch refreshes it to the newest version. Change-Id: Ied202ec2a67efed8acf297e7566949cd592c9be6 --- etc/magnum/magnum.conf.sample | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/etc/magnum/magnum.conf.sample b/etc/magnum/magnum.conf.sample index 48b40284ca..926f26b354 100644 --- a/etc/magnum/magnum.conf.sample +++ b/etc/magnum/magnum.conf.sample @@ -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 @@ -881,9 +881,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)