diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-08-23 10:35:17 +0100 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-08-23 12:09:06 +0100 |
| commit | 63cc191c2deee369b4076847204d846cf577d78b (patch) | |
| tree | 5909025afa56293a8f9b86657d7f6abbfffd38b4 /etc/nova | |
| parent | 7968a5ffbe7cf37232d670827ad017f0e8f77e99 (diff) | |
| download | nova-63cc191c2deee369b4076847204d846cf577d78b.tar.gz nova-63cc191c2deee369b4076847204d846cf577d78b.tar.xz nova-63cc191c2deee369b4076847204d846cf577d78b.zip | |
Include CommonConfigOpts options in sample config
Options defined by CommonConfigOpts are declared within the class rather
than at module level, so they weren't being included in the sample conf.
Also, in essex (and up until commit 991614add8), the sample conf file
didn't contain these options but they included the hyphen in the name.
The hyphen is only used on the command line, it is converted to an
underscore automatically in the config file. Use opt.dest rather than
opt.name as the config file key. Fixes bug #1034970.
DocImpact: update nova.conf docs
Change-Id: Ia7f3dded9148deedeb198c19a8d343db6dd93f99
Diffstat (limited to 'etc/nova')
| -rw-r--r-- | etc/nova/nova.conf.sample | 40 |
1 files changed, 39 insertions, 1 deletions
diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample index ede3003cb..d3ad9f8a9 100644 --- a/etc/nova/nova.conf.sample +++ b/etc/nova/nova.conf.sample @@ -4,6 +4,44 @@ [DEFAULT] +######## defined in nova.openstack.common.cfg:CommonConfigOpts ######## + +# debug=false +#### (BoolOpt) Print debugging output + +# verbose=false +#### (BoolOpt) Print more verbose output + +# log_config=<None> +#### (StrOpt) If this option is specified, the logging configuration file +#### specified is used and overrides any other logging options +#### specified. Please see the Python logging module +#### documentation for details on logging configuration files. + +# log_format=%(asctime)s %(levelname)8s [%(name)s] %(message)s +#### (StrOpt) A logging.Formatter log message format string which may use +#### any of the available logging.LogRecord attributes. Default: +#### %default + +# log_date_format=%Y-%m-%d %H:%M:%S +#### (StrOpt) Format string for %(asctime)s in log records. Default: +#### %default + +# log_file=<None> +#### (StrOpt) (Optional) Name of log file to output to. If not set, +#### logging will go to stdout. + +# log_dir=<None> +#### (StrOpt) (Optional) The directory to keep log files in (will be +#### prepended to --logfile) + +# use_syslog=false +#### (BoolOpt) Use syslog for logging. + +# syslog_log_facility=LOG_USER +#### (StrOpt) syslog facility to receive log lines + + ######## defined in nova.crypto ######## # ca_file=cacert.pem @@ -1908,4 +1946,4 @@ #### beprepared. Maximum value is 600 seconds (10 minutes). -# Total option count: 500 +# Total option count: 509 |