Cleaned up keystone-all --help output
- Added a missing space: mayuse -> may use - Removed default values from help messages, which were appearing as None, and should be added by argparse anyway - Updated man pages Change-Id: I471a1aaff40398488e19f91a16bd91d2d17db61d
This commit is contained in:
Dolph Mathews
parent
43ec45049f
commit
83e989fa35
@ -16,7 +16,15 @@ Keystone Startup Command
|
||||
SYNOPSIS
|
||||
========
|
||||
|
||||
keystone-all [options]
|
||||
keystone-all [-h] [--version] [--pydev-debug-port PYDEV_DEBUG_PORT]
|
||||
[--verbose] [--noverbose] [--config-dir DIR]
|
||||
[--log-config PATH] [--log-date-format DATE_FORMAT]
|
||||
[--use-syslog] [--nouse-syslog] [--log-dir LOG_DIR]
|
||||
[--syslog-log-facility SYSLOG_LOG_FACILITY]
|
||||
[--standard-threads] [--nostandard-threads]
|
||||
[--config-file PATH] [--pydev-debug-host PYDEV_DEBUG_HOST]
|
||||
[--debug] [--nodebug] [--log-format FORMAT]
|
||||
[--log-file PATH]
|
||||
|
||||
DESCRIPTION
|
||||
===========
|
||||
@ -29,40 +37,45 @@ OPTIONS
|
||||
=======
|
||||
|
||||
-h, --help show this help message and exit
|
||||
--config-file=PATH Path to a config file to use. Multiple config files
|
||||
can be specified, with values in later files taking
|
||||
precedence. The default files used are:
|
||||
['/etc/keystone/keystone.conf']
|
||||
--config-dir=DIR Path to a config directory to pull *.conf files from.
|
||||
--version show program's version number and exit
|
||||
--pydev-debug-port PYDEV_DEBUG_PORT
|
||||
--verbose, -v Print more verbose output (set logging level to INFO
|
||||
instead of default WARNING level).
|
||||
--noverbose The inverse of --verbose
|
||||
--config-dir DIR Path to a config directory to pull *.conf files from.
|
||||
This file set is sorted, so as to provide a
|
||||
predictable parse order if individual options are
|
||||
over-ridden. The set is parsed after the file(s), if
|
||||
any, specified via --config-file, hence over-ridden
|
||||
options in the directory take precedence.
|
||||
-d, --debug Print debugging output
|
||||
--nodebug The inverse of --debug
|
||||
-v, --verbose Print more verbose output
|
||||
--noverbose The inverse of --verbose
|
||||
--log-config=PATH If this option is specified, the logging configuration
|
||||
--log-config PATH 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=FORMAT A logging.Formatter log message format string which
|
||||
may use any of the available logging.LogRecord
|
||||
attributes. Default: none
|
||||
--log-date-format=DATE_FORMAT
|
||||
Format string for %(asctime)s in log records. Default:
|
||||
none
|
||||
--log-file=PATH (Optional) Name of log file to output to. If not set,
|
||||
logging will go to stdout.
|
||||
--log-dir=LOG_DIR (Optional) The directory to keep log files in (will be
|
||||
prepended to --logfile)
|
||||
--syslog-log-facility=SYSLOG_LOG_FACILITY
|
||||
(Optional) The syslog facility to use when logging to
|
||||
syslog (defaults to LOG_USER)
|
||||
--log-date-format DATE_FORMAT
|
||||
Format string for %(asctime)s in log records.
|
||||
--use-syslog Use syslog for logging.
|
||||
--nouse-syslog The inverse of --use-syslog
|
||||
--log-dir LOG_DIR The directory in which to store log files. (will be
|
||||
prepended to --log-file)
|
||||
--syslog-log-facility SYSLOG_LOG_FACILITY
|
||||
syslog facility to receive log lines.
|
||||
--standard-threads
|
||||
--nostandard-threads The inverse of --standard-threads
|
||||
--config-file PATH Path to a config file to use. Multiple config files
|
||||
can be specified, with values in later files taking
|
||||
precedence. The default files used are:
|
||||
['/etc/keystone/keystone.conf']
|
||||
--pydev-debug-host PYDEV_DEBUG_HOST
|
||||
--debug, -d Print debugging output (set logging level to DEBUG
|
||||
instead of default WARNING level).
|
||||
--nodebug The inverse of --debug
|
||||
--log-format FORMAT A logging.Formatter log message format string which
|
||||
may use any of the available logging.LogRecord
|
||||
attributes.
|
||||
--log-file PATH Name of log file to output. If not set, logging will
|
||||
go to stdout.
|
||||
|
||||
FILES
|
||||
=====
|
||||
|
||||
@ -53,41 +53,46 @@ Available commands:
|
||||
OPTIONS
|
||||
=======
|
||||
|
||||
Options:
|
||||
-h, --help show this help message and exit
|
||||
--config-file=PATH Path to a config file to use. Multiple config files
|
||||
can be specified, with values in later files taking
|
||||
precedence. The default files used are: []
|
||||
--config-dir=DIR Path to a config directory to pull *.conf files from.
|
||||
--version show program's version number and exit
|
||||
--pydev-debug-port PYDEV_DEBUG_PORT
|
||||
--verbose, -v Print more verbose output (set logging level to INFO
|
||||
instead of default WARNING level).
|
||||
--noverbose The inverse of --verbose
|
||||
--config-dir DIR Path to a config directory to pull *.conf files from.
|
||||
This file set is sorted, so as to provide a
|
||||
predictable parse order if individual options are
|
||||
over-ridden. The set is parsed after the file(s), if
|
||||
any, specified via --config-file, hence over-ridden
|
||||
options in the directory take precedence.
|
||||
-d, --debug Print debugging output
|
||||
--nodebug The inverse of --debug
|
||||
-v, --verbose Print more verbose output
|
||||
--noverbose The inverse of --verbose
|
||||
--log-config=PATH If this option is specified, the logging configuration
|
||||
--log-config PATH 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=FORMAT A logging.Formatter log message format string which
|
||||
may use any of the available logging.LogRecord
|
||||
attributes. Default: none
|
||||
--log-date-format=DATE_FORMAT
|
||||
Format string for %(asctime)s in log records. Default:
|
||||
none
|
||||
--log-file=PATH (Optional) Name of log file to output to. If not set,
|
||||
logging will go to stdout.
|
||||
--log-dir=LOG_DIR (Optional) The directory to keep log files in (will be
|
||||
prepended to --logfile)
|
||||
--syslog-log-facility=SYSLOG_LOG_FACILITY
|
||||
(Optional) The syslog facility to use when logging to
|
||||
syslog (defaults to LOG_USER)
|
||||
--log-date-format DATE_FORMAT
|
||||
Format string for %(asctime)s in log records.
|
||||
--use-syslog Use syslog for logging.
|
||||
--nouse-syslog The inverse of --use-syslog.
|
||||
--nouse-syslog The inverse of --use-syslog
|
||||
--log-dir LOG_DIR The directory in which to store log files. (will be
|
||||
prepended to --log-file)
|
||||
--syslog-log-facility SYSLOG_LOG_FACILITY
|
||||
syslog facility to receive log lines.
|
||||
--standard-threads
|
||||
--nostandard-threads The inverse of --standard-threads
|
||||
--config-file PATH Path to a config file to use. Multiple config files
|
||||
can be specified, with values in later files taking
|
||||
precedence. The default files used are:
|
||||
['/etc/keystone/keystone.conf']
|
||||
--pydev-debug-host PYDEV_DEBUG_HOST
|
||||
--debug, -d Print debugging output (set logging level to DEBUG
|
||||
instead of default WARNING level).
|
||||
--nodebug The inverse of --debug
|
||||
--log-format FORMAT A logging.Formatter log message format string which
|
||||
may use any of the available logging.LogRecord
|
||||
attributes.
|
||||
--log-file PATH Name of log file to output. If not set, logging will
|
||||
go to stdout.
|
||||
|
||||
FILES
|
||||
=====
|
||||
|
||||
@ -51,27 +51,25 @@ logging_cli_opts = [
|
||||
cfg.StrOpt('log-format',
|
||||
default=_DEFAULT_LOG_FORMAT,
|
||||
metavar='FORMAT',
|
||||
help='A logging.Formatter log message format string which may'
|
||||
'use any of the available logging.LogRecord attributes. '
|
||||
'Default: %(default)s'),
|
||||
help='A logging.Formatter log message format string which may '
|
||||
'use any of the available logging.LogRecord attributes.'),
|
||||
cfg.StrOpt('log-date-format',
|
||||
default=_DEFAULT_LOG_DATE_FORMAT,
|
||||
metavar='DATE_FORMAT',
|
||||
help='Format string for %%(asctime)s in log records. '
|
||||
'Default: %(default)s'),
|
||||
help='Format string for %%(asctime)s in log records.'),
|
||||
cfg.StrOpt('log-file',
|
||||
metavar='PATH',
|
||||
help='(Optional) Name of log file to output to. '
|
||||
help='Name of log file to output. '
|
||||
'If not set, logging will go to stdout.'),
|
||||
cfg.StrOpt('log-dir',
|
||||
help='(Optional) The directory to keep log files in '
|
||||
'(will be prepended to --logfile)'),
|
||||
help='The directory in which to store log files. '
|
||||
'(will be prepended to --log-file)'),
|
||||
cfg.BoolOpt('use-syslog',
|
||||
default=False,
|
||||
help='Use syslog for logging.'),
|
||||
cfg.StrOpt('syslog-log-facility',
|
||||
default='LOG_USER',
|
||||
help='syslog facility to receive log lines')
|
||||
help='syslog facility to receive log lines.')
|
||||
]
|
||||
|
||||
CONF = cfg.CONF
|
||||
|
||||
Loading…
Reference in New Issue
Block a user