From 3f1aa22d4be7b91cd0106962dac435d3f4ab35fb Mon Sep 17 00:00:00 2001 From: Matt Riedemann Date: Sun, 12 Mar 2017 21:23:36 -0400 Subject: [PATCH] Update ironic.conf.sample The in-tree sample of ironic.conf is stale, this updates it. Change-Id: I8c93b98d44a371587231f13e83e9198eaeddf368 --- etc/ironic/ironic.conf.sample | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample index 973a6f76f5..d98fe9c347 100644 --- a/etc/ironic/ironic.conf.sample +++ b/etc/ironic/ironic.conf.sample @@ -1251,7 +1251,7 @@ # Maximum retries in case of connection error or deadlock # error before error is raised. Set to -1 to specify an # infinite retry count. (integer value) -#db_max_retries = 5 +#db_max_retries = 20 [deploy] @@ -2659,7 +2659,8 @@ # Max fetch bytes of Kafka consumer (integer value) #kafka_max_fetch_bytes = 1048576 -# Default timeout(s) for Kafka consumers (integer value) +# Default timeout(s) for Kafka consumers (floating point +# value) #kafka_consumer_timeout = 1.0 # Pool Size for Kafka Consumers (integer value) @@ -2724,24 +2725,27 @@ # Deprecated group/name - [DEFAULT]/amqp_auto_delete #amqp_auto_delete = false +# Enable SSL (boolean value) +#ssl = + # SSL version to use (valid only if SSL enabled). Valid values # are TLSv1 and SSLv23. SSLv2, SSLv3, TLSv1_1, and TLSv1_2 may # be available on some distributions. (string value) -# Deprecated group/name - [DEFAULT]/kombu_ssl_version -#kombu_ssl_version = +# Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_version +#ssl_version = # SSL key file (valid only if SSL enabled). (string value) -# Deprecated group/name - [DEFAULT]/kombu_ssl_keyfile -#kombu_ssl_keyfile = +# Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_keyfile +#ssl_key_file = # SSL cert file (valid only if SSL enabled). (string value) -# Deprecated group/name - [DEFAULT]/kombu_ssl_certfile -#kombu_ssl_certfile = +# Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_certfile +#ssl_cert_file = # SSL certification authority file (valid only if SSL # enabled). (string value) -# Deprecated group/name - [DEFAULT]/kombu_ssl_ca_certs -#kombu_ssl_ca_certs = +# Deprecated group/name - [oslo_messaging_rabbit]/kombu_ssl_ca_certs +#ssl_ca_file = # How long to wait before reconnecting in response to an AMQP # consumer cancel notification. (floating point value) @@ -2792,10 +2796,6 @@ # Reason: Replaced by [DEFAULT]/transport_url #rabbit_hosts = $rabbit_host:$rabbit_port -# Connect over SSL for RabbitMQ. (boolean value) -# Deprecated group/name - [DEFAULT]/rabbit_use_ssl -#rabbit_use_ssl = false - # DEPRECATED: The RabbitMQ userid. (string value) # Deprecated group/name - [DEFAULT]/rabbit_userid # This option is deprecated for removal. @@ -2888,9 +2888,6 @@ # (integer value) #heartbeat_interval = 3 -# Enable SSL (boolean value) -#ssl = - # Arguments passed to ssl.wrap_socket (dict value) #ssl_options =