Merge "opts: Remove deprecated aliases"

oslo_log/_options.py

@@ -56,7 +56,6 @@ logging_cli_opts = [
     cfg.StrOpt(
         'log-config-append',
         metavar='PATH',
-        deprecated_name='log-config',
         mutable=True,
         help='The name of a logging configuration file. This file '
         'is appended to any existing logging configuration '
@@ -77,14 +76,12 @@ logging_cli_opts = [
     cfg.StrOpt(
         'log-file',
         metavar='PATH',
-        deprecated_name='logfile',
         help='(Optional) Name of log file to send logging output to. '
         'If no default is set, logging will go to stderr as '
         'defined by use_stderr. ' + _IGNORE_MESSAGE,
     ),
     cfg.StrOpt(
         'log-dir',
-        deprecated_name='logdir',
         help='(Optional) The base directory used for relative log_file '
         ' paths. ' + _IGNORE_MESSAGE,
     ),

oslo_log/tests/unit/test_log.py

@@ -1692,7 +1692,7 @@ class LogConfigOptsTestCase(BaseTestCase):
         f = io.StringIO()
         self.CONF([])
         self.CONF.print_help(file=f)
-        for option in ['debug', 'log-config']:
+        for option in ['debug', 'log-config-append']:
             self.assertIn(option, f.getvalue())
 
     def test_debug(self):
@@ -1750,21 +1750,11 @@ class LogConfigOptsTestCase(BaseTestCase):
                 logging.ERROR,
             )
 
-    def test_logfile_deprecated(self):
-        logfile = '/some/other/path/foo-bar.log'
-        self.CONF(['--logfile', logfile])
-        self.assertEqual(logfile, self.CONF.log_file)
-
     def test_log_dir(self):
         log_dir = '/some/path/'
         self.CONF(['--log-dir', log_dir])
         self.assertEqual(log_dir, self.CONF.log_dir)
 
-    def test_logdir_deprecated(self):
-        logdir = '/some/other/path/'
-        self.CONF(['--logdir', logdir])
-        self.assertEqual(logdir, self.CONF.log_dir)
-
     def test_default_formatter(self):
         log._setup_logging_from_conf(self.CONF, 'test', 'test')
         logger = log._loggers[None].logger

releasenotes/notes/remove-deprecated-opts-57426b5f4a3a7bab.yaml

@@ -0,0 +1,8 @@
+---
+upgrade:
+  - |
+    The following deprecated option aliases have been removed:
+
+    - ``[oslo_log] log-config`` (use ``[oslo_log] log-config-append``)
+    - ``[oslo_log] logfile`` (use ``[oslo_log] log-file``)
+    - ``[oslo_log] logdir`` (use ``[oslo_log] log-dir``)