Add missing log_format, log_file, log_dir opts.

In 49447c2 we broke keystone in that config.py no longer
provides the options it uses. This commit fixes that
by adding back in conf.log_format, conf.log_file, and conf.log_dir
... all of which are used and required by config.py.

Fixes LP Bug #1122403.

Change-Id: I5015315724eab511f6c570fdd5b9be357777b4a0

1 files changed, 13 insertions, 0 deletions

diff --git a/keystone/config.py b/keystone/config.py
index 707649a3..3c01a88f 100644
--- a/keystone/config.py
+++ b/keystone/config.py
@@ -48,11 +48,24 @@ logging_cli_opts = [
                     'options specified. Please see the Python logging module '
                     'documentation for details on logging configuration '
                     'files.'),
+    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'),
     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'),
+    cfg.StrOpt('log-file',
+               metavar='PATH',
+               help='(Optional) Name of log file to output to. '
+                    '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)'),
     cfg.BoolOpt('use-syslog',
                 default=False,
                 help='Use syslog for logging.'),