summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorThomas Herve <thomas.herve@enovance.com>2014-06-17 11:22:37 +0200
committerThomas Herve <thomas.herve@enovance.com>2014-06-17 11:22:37 +0200
commit7f7817c157a05a982bec48631f9eb3b65f9d5f66 (patch)
tree1871383dd1b27e675f549ca6d02df19289fd35b0 /etc
parent5a9ee2ddd8add13bb49b19a89f8617dc1395d4af (diff)
downloadheat-7f7817c157a05a982bec48631f9eb3b65f9d5f66.tar.gz
Sync with oslo incubator
Sync with oslo incubator at 45890dae35cd14a25175cdce7c12a5f9acbd712f Change-Id: I44ecc69f1d952061be7cb2f41678b879ded93eae
Diffstat (limited to 'etc')
-rw-r--r--etc/heat/heat.conf.sample6
1 files changed, 5 insertions, 1 deletions
diff --git a/etc/heat/heat.conf.sample b/etc/heat/heat.conf.sample
index b9f2d3332..94261b3da 100644
--- a/etc/heat/heat.conf.sample
+++ b/etc/heat/heat.conf.sample
@@ -290,7 +290,7 @@
#log_dir=<None>
# Use syslog for logging. Existing syslog format is DEPRECATED
-# during I, and will chang in J to honor RFC5424. (boolean
+# during I, and will change in J to honor RFC5424. (boolean
# value)
#use_syslog=false
@@ -415,6 +415,10 @@
# (string value)
#kombu_ssl_ca_certs=
+# How long to wait before reconnecting in response to an AMQP
+# consumer cancel notification. (floating point value)
+#kombu_reconnect_delay=1.0
+
# The RabbitMQ broker address where a single node is used
# (string value)
#rabbit_host=localhost