summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorHironori Shiina <shiina.hironori@jp.fujitsu.com>2017-10-30 19:23:21 +0900
committerHironori Shiina <shiina.hironori@jp.fujitsu.com>2017-10-30 19:23:21 +0900
commit5c72286338f0dcbcf7467b2a7566ac24da221d62 (patch)
tree2d0b053bf393ec059142a694e1c3d7531a965716 /etc
parentfaae2c535f6971681d74729895117ad05775a2a4 (diff)
downloadironic-5c72286338f0dcbcf7467b2a7566ac24da221d62.tar.gz
Update ironic.sample.conf
Updates ironic.sample.conf since some help messages were updated in a few oslo libraries. Change-Id: I535cbd5a1b1722cb6fc9bba02327fd7fa59a19c0
Diffstat (limited to 'etc')
-rw-r--r--etc/ironic/ironic.conf.sample65
1 files changed, 60 insertions, 5 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index dafcfb130..c6365ab8b 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -681,8 +681,18 @@
# Seconds to wait for a response from a call. (integer value)
#rpc_response_timeout = 60
-# A URL representing the messaging driver to use and its full
-# configuration. (string value)
+# The network address and optional user credentials for
+# connecting to the messaging backend, in URL format. The
+# expected format is:
+#
+# driver://[user:pass@]host:port[,[userN:passN@]hostN:portN]/virtual_host?query
+#
+# Example: rabbit://rabbitmq:password@127.0.0.1:5672//
+#
+# For full details on the fields in the URL see the
+# documentation of oslo_messaging.TransportURL at
+# https://docs.openstack.org/oslo.messaging/latest/reference/transport.html
+# (string value)
#transport_url = <None>
# DEPRECATED: The messaging driver to use, defaults to rabbit.
@@ -1265,12 +1275,16 @@
# Cluster (NDB). (boolean value)
#mysql_enable_ndb = false
-# Timeout before idle SQL connections are reaped. (integer
-# value)
+# Connections which have been present in the connection pool
+# longer than this number of seconds will be replaced with a
+# new one the next time they are checked out from the pool.
+# (integer value)
+# Deprecated group/name - [DATABASE]/idle_timeout
+# Deprecated group/name - [database]/idle_timeout
# Deprecated group/name - [DEFAULT]/sql_idle_timeout
# Deprecated group/name - [DATABASE]/sql_idle_timeout
# Deprecated group/name - [sql]/idle_timeout
-#idle_timeout = 3600
+#connection_recycle_time = 3600
# Minimum number of SQL connections to keep open in a pool.
# (integer value)
@@ -2581,6 +2595,16 @@
# value)
#ssl_key_password = <None>
+# By default SSL checks that the name in the server's
+# certificate matches the hostname in the transport_url. In
+# some configurations it may be preferable to use the virtual
+# hostname instead, for example if the server uses the Server
+# Name Indication TLS extension (rfc6066) to provide a
+# certificate per virtual host. Set ssl_verify_vhost to True
+# if the server's SSL certificate uses the virtual host name
+# instead of the DNS name. (boolean value)
+#ssl_verify_vhost = false
+
# DEPRECATED: Accept clients using either SSL or plain TCP
# (boolean value)
# This option is deprecated for removal.
@@ -2676,6 +2700,16 @@
# (string value)
#addressing_mode = dynamic
+# Enable virtual host support for those message buses that do
+# not natively support virtual hosting (such as qpidd). When
+# set to true the virtual host name will be added to all
+# message bus addresses, effectively creating a private
+# 'subnet' per virtual host. Set to False if the message bus
+# supports virtual hosting using the 'hostname' field in the
+# AMQP 1.0 Open performative as the name of the virtual host.
+# (boolean value)
+#pseudo_vhost = true
+
# address prefix used when sending to a specific server
# (string value)
#server_request_prefix = exclusive
@@ -3290,6 +3324,27 @@
# (multi valued)
#policy_dirs = policy.d
+# Content Type to send and receive data for REST based policy
+# check (string value)
+# Allowed values: application/x-www-form-urlencoded, application/json
+#remote_content_type = application/x-www-form-urlencoded
+
+# server identity verification for REST based policy check
+# (boolean value)
+#remote_ssl_verify_server_crt = false
+
+# Absolute path to ca cert file for REST based policy check
+# (string value)
+#remote_ssl_ca_crt_file = <None>
+
+# Absolute path to client cert for REST based policy check
+# (string value)
+#remote_ssl_client_crt_file = <None>
+
+# Absolute path client key file REST based policy check
+# (string value)
+#remote_ssl_client_key_file = <None>
+
[profiler]