From f1b58b7dae813244519b14f51c4dadc29f16e178 Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Thu, 8 Sep 2016 13:41:38 +0100 Subject: [PATCH] Update ironic/ironic.conf.sample Change-Id: I641136fcd8cb565663654a44a8e7a776495af81c --- etc/ironic/ironic.conf.sample | 154 +++++++++++++++++++++++++++++----- 1 file changed, 135 insertions(+), 19 deletions(-) diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index f760fc66fa..5a2815c0c5 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -348,6 +348,13 @@ # Deprecated group/name - [DEFAULT]/rpc_zmq_serialization #rpc_zmq_serialization = json +# This option configures round-robin mode in zmq socket. True +# means not keeping a queue when server side disconnects. +# False means to keep queue and messages even if server is +# disconnected, when the server appears we send all +# accumulated messages to it. (boolean value) +#zmq_immediate = false + # Size of executor thread pool. (integer value) # Deprecated group/name - [DEFAULT]/rpc_thread_pool_size #executor_thread_pool_size = 64 @@ -1786,11 +1793,11 @@ # Time in ms to wait between connection attempts. (integer # value) -#wait_timeout = 5000 +#wait_timeout = 2000 # Time in ms to wait before the transaction is killed. # (integer value) -#check_timeout = 60000 +#check_timeout = 20000 # Timeout in ms on blocking socket operations (integer value) #socket_timeout = 10000 @@ -2070,22 +2077,8 @@ # From oslo.messaging # -# address prefix used when sending to a specific server -# (string value) -# Deprecated group/name - [amqp1]/server_request_prefix -#server_request_prefix = exclusive - -# address prefix used when broadcasting to all servers (string -# value) -# Deprecated group/name - [amqp1]/broadcast_prefix -#broadcast_prefix = broadcast - -# address prefix when sending to any server in group (string -# value) -# Deprecated group/name - [amqp1]/group_request_prefix -#group_request_prefix = unicast - -# Name for the AMQP container (string value) +# Name for the AMQP container. must be globally unique. +# Defaults to a generated UUID (string value) # Deprecated group/name - [amqp1]/container_name #container_name = @@ -2145,6 +2138,122 @@ # Deprecated group/name - [amqp1]/password #password = +# Seconds to pause before attempting to re-connect. (integer +# value) +# Minimum value: 1 +#connection_retry_interval = 1 + +# Increase the connection_retry_interval by this many seconds +# after each unsuccessful failover attempt. (integer value) +# Minimum value: 0 +#connection_retry_backoff = 2 + +# Maximum limit for connection_retry_interval + +# connection_retry_backoff (integer value) +# Minimum value: 1 +#connection_retry_interval_max = 30 + +# Time to pause between re-connecting an AMQP 1.0 link that +# failed due to a recoverable error. (integer value) +# Minimum value: 1 +#link_retry_delay = 10 + +# The deadline for an rpc reply message delivery. Only used +# when caller does not provide a timeout expiry. (integer +# value) +# Minimum value: 5 +#default_reply_timeout = 30 + +# The deadline for an rpc cast or call message delivery. Only +# used when caller does not provide a timeout expiry. (integer +# value) +# Minimum value: 5 +#default_send_timeout = 30 + +# The deadline for a sent notification message delivery. Only +# used when caller does not provide a timeout expiry. (integer +# value) +# Minimum value: 5 +#default_notify_timeout = 30 + +# Indicates the addressing mode used by the driver. +# Permitted values: +# 'legacy' - use legacy non-routable addressing +# 'routable' - use routable addresses +# 'dynamic' - use legacy addresses if the message bus does +# not support routing otherwise use routable addressing +# (string value) +#addressing_mode = dynamic + +# address prefix used when sending to a specific server +# (string value) +# Deprecated group/name - [amqp1]/server_request_prefix +#server_request_prefix = exclusive + +# address prefix used when broadcasting to all servers (string +# value) +# Deprecated group/name - [amqp1]/broadcast_prefix +#broadcast_prefix = broadcast + +# address prefix when sending to any server in group (string +# value) +# Deprecated group/name - [amqp1]/group_request_prefix +#group_request_prefix = unicast + +# Address prefix for all generated RPC addresses (string +# value) +#rpc_address_prefix = openstack.org/om/rpc + +# Address prefix for all generated Notification addresses +# (string value) +#notify_address_prefix = openstack.org/om/notify + +# Appended to the address prefix when sending a fanout +# message. Used by the message bus to identify fanout +# messages. (string value) +#multicast_address = multicast + +# Appended to the address prefix when sending to a particular +# RPC/Notification server. Used by the message bus to identify +# messages sent to a single destination. (string value) +#unicast_address = unicast + +# Appended to the address prefix when sending to a group of +# consumers. Used by the message bus to identify messages that +# should be delivered in a round-robin fashion across +# consumers. (string value) +#anycast_address = anycast + +# Exchange name used in notification addresses. +# Exchange name resolution precedence: +# Target.exchange if set +# else default_notification_exchange if set +# else control_exchange if set +# else 'notify' (string value) +#default_notification_exchange = + +# Exchange name used in RPC addresses. +# Exchange name resolution precedence: +# Target.exchange if set +# else default_rpc_exchange if set +# else control_exchange if set +# else 'rpc' (string value) +#default_rpc_exchange = + +# Window size for incoming RPC Reply messages. (integer value) +# Minimum value: 1 +#reply_link_credit = 200 + +# Window size for incoming RPC Request messages (integer +# value) +# Minimum value: 1 +#rpc_server_credit = 100 + +# Window size for incoming Notification messages (integer +# value) +# Minimum value: 1 +#notify_server_credit = 100 + [oslo_messaging_notifications] @@ -2210,7 +2319,7 @@ #kombu_reconnect_delay = 1.0 # EXPERIMENTAL: Possible values are: gzip, bz2. If not set -# compression will not be used. This option may notbe +# compression will not be used. This option may not be # available in future versions. (string value) #kombu_compression = @@ -2542,6 +2651,13 @@ # Deprecated group/name - [DEFAULT]/rpc_zmq_serialization #rpc_zmq_serialization = json +# This option configures round-robin mode in zmq socket. True +# means not keeping a queue when server side disconnects. +# False means to keep queue and messages even if server is +# disconnected, when the server appears we send all +# accumulated messages to it. (boolean value) +#zmq_immediate = false + [oslo_policy]