Browse Source

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
tags/kilo-eol^0
ZhiQiang Fan 3 years ago
parent
commit
ddfcbc64fc
1 changed files with 5 additions and 4 deletions
  1. 5
    4
      etc/magnum/magnum.conf.sample

+ 5
- 4
etc/magnum/magnum.conf.sample View File

@@ -133,7 +133,7 @@
133 133
 #rpc_zmq_bind_address = *
134 134
 
135 135
 # MatchMaker driver. (string value)
136
-#rpc_zmq_matchmaker = oslo_messaging._drivers.matchmaker.MatchMakerLocalhost
136
+#rpc_zmq_matchmaker = local
137 137
 
138 138
 # ZeroMQ receiver listening port. (integer value)
139 139
 #rpc_zmq_port = 9501
@@ -881,9 +881,10 @@
881 881
 #rabbit_ha_queues = false
882 882
 
883 883
 # Number of seconds after which the Rabbit broker is considered down
884
-# if heartbeat's keep-alive fails (0 disable the heartbeat). (integer
885
-# value)
886
-#heartbeat_timeout_threshold = 60
884
+# if heartbeat's keep-alive fails (0 disables the heartbeat, >0
885
+# enables it. Enabling heartbeats requires kombu>=3.0.7 and
886
+# amqp>=1.4.0). EXPERIMENTAL (integer value)
887
+#heartbeat_timeout_threshold = 0
887 888
 
888 889
 # How often times during the heartbeat_timeout_threshold we check the
889 890
 # heartbeat. (integer value)

Loading…
Cancel
Save