summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMario Villaplana <mario.villaplana@gmail.com>2016-05-11 13:54:20 +0000
committerMario Villaplana <mario.villaplana@gmail.com>2016-05-11 13:54:20 +0000
commite61006be2c45aff0d8bf0888153dda50d716d06f (patch)
treeb8978bacbcbcaaee7bef8af1d90ac438102a4fcd /etc
parent6cd2f21ab01f263f58121e48601f8bf2626095bf (diff)
downloadironic-e61006be2c45aff0d8bf0888153dda50d716d06f.tar.gz
Regenerate sample configuration
Some configuration descriptions and default values have changed without the sample configuration being updated. Some of these default changes are the result of a global requirements update. Change-Id: Iea6794e3b5c57f75d82a460fa2dd7d294c1c88b7
Diffstat (limited to 'etc')
-rw-r--r--etc/ironic/ironic.conf.sample18
1 files changed, 13 insertions, 5 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index a287f9c29..14a626848 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -287,6 +287,7 @@
# Type of concurrency used. Either "native" or "eventlet"
# (string value)
+# Allowed values: eventlet, native
#rpc_zmq_concurrency = eventlet
# Number of ZeroMQ contexts, defaults to 1. (integer value)
@@ -324,10 +325,13 @@
# proxy. (boolean value)
#use_pub_sub = true
+# Use ROUTER remote proxy for direct methods. (boolean value)
+#use_router_proxy = false
+
# Minimal port number for random ports range. (port value)
# Minimum value: 0
# Maximum value: 65535
-#rpc_zmq_min_port = 49152
+#rpc_zmq_min_port = 49153
# Maximal port number for random ports range. (integer value)
# Minimum value: 1
@@ -711,7 +715,9 @@
#
# Indicate whether this resource may be shared with the domain
-# received in the requests "origin" header. (list value)
+# received in the requests "origin" header. Format:
+# "<protocol>://<host>[:<port>]", no trailing slash. Example:
+# https://horizon.example.com (list value)
#allowed_origin = <None>
# Indicate that the actual request can include user
@@ -742,7 +748,9 @@
#
# Indicate whether this resource may be shared with the domain
-# received in the requests "origin" header. (list value)
+# received in the requests "origin" header. Format:
+# "<protocol>://<host>[:<port>]", no trailing slash. Example:
+# https://horizon.example.com (list value)
#allowed_origin = <None>
# Indicate that the actual request can include user
@@ -1876,7 +1884,7 @@
# How often to send heartbeats for consumer's connections
# (integer value)
-#heartbeat_interval = 1
+#heartbeat_interval = 3
# Enable SSL (boolean value)
#ssl = <None>
@@ -1898,7 +1906,7 @@
# Maximum number of connections to keep queued. (integer
# value)
-#pool_max_size = 10
+#pool_max_size = 30
# Maximum number of connections to create above
# `pool_max_size`. (integer value)