Merge "Regenerate sample configuration"

This commit is contained in:
Jenkins 2016-05-11 18:05:02 +00:00 committed by Gerrit Code Review
commit 95ff5badbd

View File

@ -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
@ -1886,7 +1894,7 @@
# How often to send heartbeats for consumer's connections
# (integer value)
#heartbeat_interval = 1
#heartbeat_interval = 3
# Enable SSL (boolean value)
#ssl = <None>
@ -1908,7 +1916,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)