summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorRamamani Yeleswarapu <ramamani.yeleswarapu@intel.com>2016-04-15 15:51:42 -0700
committerRamamani Yeleswarapu <ramamani.yeleswarapu@intel.com>2016-07-15 14:05:09 -0700
commit6f0aea966b49ec4c1470d18e91fb2bf95cfb5963 (patch)
tree68ab50cab7dc9423c9b9c94135d45c455401c16d /etc
parent47985ea077e59c23adb05056e84fd38b8ffa5534 (diff)
downloadironic-6f0aea966b49ec4c1470d18e91fb2bf95cfb5963.tar.gz
Centralize config options - [DEFAULT]
Nova style refactor of config options in Ironic. Change-Id: I6baebf1bbc829238441ddd1399f6487fad33a15e Partial-Bug: #1561100
Diffstat (limited to 'etc')
-rw-r--r--etc/ironic/ironic.conf.sample37
1 files changed, 21 insertions, 16 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index 10e7b8ac7..397e4ceb3 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -37,7 +37,7 @@
# recommended set of production-oriented network interfaces. A
# complete list of network interfaces present on your system
# may be found by enumerating the
-# "ironic.hardware.interfaces.network" entrypoint.This value
+# "ironic.hardware.interfaces.network" entrypoint. This value
# must be the same on all ironic-conductor and ironic-api
# services, because it is used by ironic-api service to
# validate a new or updated node's network_interface value.
@@ -96,6 +96,15 @@
# Template file for grub configuration file. (string value)
#grub_config_template = $pybasedir/common/grub_conf.template
+# Run image downloads and raw format conversions in parallel.
+# (boolean value)
+#parallel_image_downloads = false
+
+# IP address of this host. If unset, will determine the IP
+# programmatically. If unable to do so, will use "127.0.0.1".
+# (string value)
+#my_ip = 127.0.0.1
+
# Directory where the ironic python module is installed.
# (string value)
#pybasedir = /usr/lib/python/site-packages/ironic/ironic
@@ -123,15 +132,6 @@
# (string value)
#tempdir = /tmp
-# Run image downloads and raw format conversions in parallel.
-# (boolean value)
-#parallel_image_downloads = false
-
-# IP address of this host. If unset, will determine the IP
-# programmatically. If unable to do so, will use "127.0.0.1".
-# (string value)
-#my_ip = 127.0.0.1
-
#
# From oslo.log
#
@@ -156,6 +156,7 @@
# is set in the configuration file and other logging
# configuration options are ignored (for example,
# logging_context_format_string). (string value)
+# Note: This option can be changed without restarting.
# Deprecated group/name - [DEFAULT]/log_config
#log_config_append = <None>
@@ -635,13 +636,13 @@
# From ironic
#
-# Path to serial console terminal program. Used only by
-# Shell In A Box console. (string value)
+# Path to serial console terminal program. Used only by Shell
+# In A Box console. (string value)
#terminal = shellinaboxd
-# Directory containing the terminal SSL cert(PEM) for serial
-# console access. Used only by Shell In A Box console.
-# (string value)
+# Directory containing the terminal SSL cert (PEM) for serial
+# console access. Used only by Shell In A Box console. (string
+# value)
#terminal_cert_dir = <None>
# Directory for holding terminal pid files. If not specified,
@@ -736,8 +737,12 @@
# From oslo.db
#
-# The file name to use with SQLite. (string value)
+# DEPRECATED: The file name to use with SQLite. (string value)
# Deprecated group/name - [DEFAULT]/sqlite_db
+# This option is deprecated for removal.
+# Its value may be silently ignored in the future.
+# Reason: Should use config option connection or
+# slave_connection to connect the database.
#sqlite_db = oslo.sqlite
# If True, SQLite uses synchronous mode. (boolean value)