summaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorRuby Loo <ruby.loo@intel.com>2017-11-15 16:00:38 -0500
committerRuby Loo <ruby.loo@intel.com>2017-11-15 16:00:38 -0500
commit36580fb49679a123768bda4452c93171c1b98db8 (patch)
tree63c8b560ed4f0b33bcf989e0af2421a5e6d301f9 /etc
parent6771fc53e2744054586576a965d992ea418e1161 (diff)
downloadironic-36580fb49679a123768bda4452c93171c1b98db8.tar.gz
Add 9.2 to release mappings
As part of the process for doing an ironic release, we need to add the new release to the release mappings as documented in https://docs.openstack.org/ironic/latest/contributor/releasing.html. This is needed for rolling upgrades to work. This adds ironic 9.2 to the release mappings. Change-Id: Id1ace223c91c2e63529c16450f7c0a92eaca521b
Diffstat (limited to 'etc')
-rw-r--r--etc/ironic/ironic.conf.sample6
1 files changed, 5 insertions, 1 deletions
diff --git a/etc/ironic/ironic.conf.sample b/etc/ironic/ironic.conf.sample
index 515d078d1..c11b6cd0b 100644
--- a/etc/ironic/ironic.conf.sample
+++ b/etc/ironic/ironic.conf.sample
@@ -368,7 +368,7 @@
# (default), leave it unset and the latest versions of RPC
# communication and database objects will be used. (string
# value)
-# Allowed values: pike, 9.1, 9.0, 8.0
+# Allowed values: pike, 9.2, 9.1, 9.0, 8.0
#pin_release_version = <None>
# Path to the rootwrap configuration file to use for running
@@ -442,6 +442,10 @@
# if log_config_append is set. (string value)
#syslog_log_facility = LOG_USER
+# Use JSON formatting for logging. This option is ignored if
+# log_config_append is set. (boolean value)
+#use_json = false
+
# Log output to standard error. This option is ignored if
# log_config_append is set. (boolean value)
#use_stderr = false