Merge "Add deprecated --logdir common opt"

2 files changed, 12 insertions, 2 deletions

diff --git a/openstack/common/cfg.py b/openstack/common/cfg.py
index 3d0ab45..8f25c5c 100644
--- a/openstack/common/cfg.py
+++ b/openstack/common/cfg.py
@@ -1767,6 +1767,7 @@ class CommonConfigOpts(ConfigOpts):
                help='(Optional) Name of log file to output to. '
                     'If not set, logging will go to stdout.'),
         StrOpt('log-dir',
+               deprecated_name='logdir',
                help='(Optional) The directory to keep log files in '
                     '(will be prepended to --log-file)'),
         BoolOpt('use-syslog',
diff --git a/tests/unit/test_cfg.py b/tests/unit/test_cfg.py
index ef917ca..ff24c0c 100644
--- a/tests/unit/test_cfg.py
+++ b/tests/unit/test_cfg.py
@@ -1613,12 +1613,21 @@ class CommonOptsTestCase(BaseTestCase):
         self.conf(['--log-file', log_file])
         self.assertEquals(self.conf.log_file, log_file)
 
-    def test_logfile(self):
+    def test_logfile_deprecated(self):
         logfile = '/some/other/path/foo-bar.log'
-        #NOTE(dprince): this is now a deprecated option for --log-file
         self.conf(['--logfile', logfile])
         self.assertEquals(self.conf.log_file, logfile)
 
+    def test_log_dir(self):
+        log_dir = '/some/path/'
+        self.conf(['--log-dir', log_dir])
+        self.assertEquals(self.conf.log_dir, log_dir)
+
+    def test_logdir_deprecated(self):
+        logdir = '/some/other/path/'
+        self.conf(['--logdir', logdir])
+        self.assertEquals(self.conf.log_dir, logdir)
+
 
 class ConfigParserTestCase(unittest.TestCase):
     def test_no_section(self):