Update ironic.conf.sample by applying the bug fix #1522841

This patch updates and removes obsoleted config parameters in
ironic.conf.sample with updates of keystonemiddleware is 4.0.0 and
oslo.messaging 3.1.0.

Related-bug: #1522841
Change-Id: I1c24c49f6a07fc4289d8732b0ab4e6ced179e47e
This commit is contained in:
Naohiro Tamura 2015-12-10 17:44:10 +09:00
parent d5fbb1c38d
commit a2df90bde1

View File

@ -321,11 +321,11 @@
# value)
#rpc_poll_timeout=1
# Shows whether zmq-messaging uses broker or not. (boolean
# Configures zmq-messaging to use broker or not. (boolean
# value)
#zmq_use_broker=true
#zmq_use_broker=false
# Minimal port number for random ports range. (integer value)
# Minimal port number for random ports range. (port value)
#rpc_zmq_min_port=49152
# Maximal port number for random ports range. (integer value)
@ -338,7 +338,7 @@
# Host to locate redis. (string value)
#host=127.0.0.1
# Use this port to connect to redis host. (integer value)
# Use this port to connect to redis host. (port value)
#port=6379
# Password for Redis server (optional). (string value)
@ -351,16 +351,19 @@
# The Drivers(s) to handle sending notifications. Possible
# values are messaging, messagingv2, routing, log, test, noop
# (multi valued)
#notification_driver=
# Deprecated group/name - [DEFAULT]/notification_driver
#driver=
# A URL representing the messaging driver to use for
# notifications. If not set, we fall back to the same
# configuration used for RPC. (string value)
#notification_transport_url=<None>
# Deprecated group/name - [DEFAULT]/notification_transport_url
#transport_url=<None>
# AMQP topic used for OpenStack notifications. (list value)
# Deprecated group/name - [rpc_notifier2]/topics
#notification_topics=notifications
# Deprecated group/name - [DEFAULT]/notification_topics
#topics=notifications
# Seconds to wait for a response from a call. (integer value)
#rpc_response_timeout=60
@ -371,7 +374,7 @@
#transport_url=<None>
# The messaging driver to use, defaults to rabbit. Other
# drivers include qpid and zmq. (string value)
# drivers include amqp and zmq. (string value)
#rpc_backend=rabbit
# The default exchange under which topics are scoped. May be
@ -1475,6 +1478,14 @@
# Service tenant name. (string value)
#admin_tenant_name=admin
# Authentication type to load (type of value is unknown)
# Deprecated group/name - [keystone_authtoken]/auth_plugin
#auth_type=<None>
# Config Section from which to load plugin specific options
# (type of value is unknown)
#auth_section=<None>
[matchmaker_redis]
@ -1485,7 +1496,7 @@
# Host to locate redis. (string value)
#host=127.0.0.1
# Use this port to connect to redis host. (integer value)
# Use this port to connect to redis host. (port value)
#port=6379
# Password for Redis server (optional). (string value)
@ -1650,86 +1661,6 @@
#password=
[oslo_messaging_qpid]
#
# Options defined in oslo.messaging
#
# Use durable queues in AMQP. (boolean value)
# Deprecated group/name - [DEFAULT]/amqp_durable_queues
# Deprecated group/name - [DEFAULT]/rabbit_durable_queues
#amqp_durable_queues=false
# Auto-delete queues in AMQP. (boolean value)
# Deprecated group/name - [DEFAULT]/amqp_auto_delete
#amqp_auto_delete=false
# Send a single AMQP reply to call message. The current
# behaviour since oslo-incubator is to send two AMQP replies -
# first one with the payload, a second one to ensure the other
# have finish to send the payload. We are going to remove it
# in the N release, but we must keep backward compatible at
# the same time. This option provides such compatibility - it
# defaults to False in Liberty and can be turned on for early
# adopters with a new installations or for testing. Please
# note, that this option will be removed in the Mitaka
# release. (boolean value)
#send_single_reply=false
# Qpid broker hostname. (string value)
# Deprecated group/name - [DEFAULT]/qpid_hostname
#qpid_hostname=localhost
# Qpid broker port. (integer value)
# Deprecated group/name - [DEFAULT]/qpid_port
#qpid_port=5672
# Qpid HA cluster host:port pairs. (list value)
# Deprecated group/name - [DEFAULT]/qpid_hosts
#qpid_hosts=$qpid_hostname:$qpid_port
# Username for Qpid connection. (string value)
# Deprecated group/name - [DEFAULT]/qpid_username
#qpid_username=
# Password for Qpid connection. (string value)
# Deprecated group/name - [DEFAULT]/qpid_password
#qpid_password=
# Space separated list of SASL mechanisms to use for auth.
# (string value)
# Deprecated group/name - [DEFAULT]/qpid_sasl_mechanisms
#qpid_sasl_mechanisms=
# Seconds between connection keepalive heartbeats. (integer
# value)
# Deprecated group/name - [DEFAULT]/qpid_heartbeat
#qpid_heartbeat=60
# Transport to use, either 'tcp' or 'ssl'. (string value)
# Deprecated group/name - [DEFAULT]/qpid_protocol
#qpid_protocol=tcp
# Whether to disable the Nagle algorithm. (boolean value)
# Deprecated group/name - [DEFAULT]/qpid_tcp_nodelay
#qpid_tcp_nodelay=true
# The number of prefetched messages held by receiver. (integer
# value)
# Deprecated group/name - [DEFAULT]/qpid_receiver_capacity
#qpid_receiver_capacity=1
# The qpid topology version to use. Version 1 is what was
# originally used by impl_qpid. Version 2 includes some
# backwards-incompatible changes that allow broker federation
# to work. Users should update to version 2 when they are
# able to take everything down, as it requires a clean break.
# (integer value)
# Deprecated group/name - [DEFAULT]/qpid_topology_version
#qpid_topology_version=1
[oslo_messaging_rabbit]
#
@ -1781,18 +1712,25 @@
# Deprecated group/name - [DEFAULT]/kombu_reconnect_delay
#kombu_reconnect_delay=1.0
# How long to wait before considering a reconnect attempt to
# have failed. This value should not be longer than
# How long to wait a missing client beforce abandoning to send
# it its replies. This value should not be longer than
# rpc_response_timeout. (integer value)
#kombu_reconnect_timeout=60
# Deprecated group/name - [oslo_messaging_rabbit]/kombu_reconnect_timeout
#kombu_missing_consumer_retry_timeout=5
# Determines how the next RabbitMQ node is chosen in case the
# one we are currently connected to becomes unavailable. Takes
# effect only if more than one RabbitMQ node is provided in
# config. (string value)
#kombu_failover_strategy=round-robin
# The RabbitMQ broker address where a single node is used.
# (string value)
# Deprecated group/name - [DEFAULT]/rabbit_host
#rabbit_host=localhost
# The RabbitMQ broker port where a single node is used.
# (integer value)
# The RabbitMQ broker port where a single node is used. (port
# value)
# Deprecated group/name - [DEFAULT]/rabbit_port
#rabbit_port=5672