diff --git a/nova/tests/unit/virt/ironic/test_driver.py b/nova/tests/unit/virt/ironic/test_driver.py index 46dc1d21fbad..b3c3cc2b7b74 100644 --- a/nova/tests/unit/virt/ironic/test_driver.py +++ b/nova/tests/unit/virt/ironic/test_driver.py @@ -87,6 +87,9 @@ class IronicDriverTestCase(test.NoDBTestCase): super(IronicDriverTestCase, self).setUp() self.flags(**IRONIC_FLAGS) + # set client log config to exercise the code that manipulates it + CONF.set_override('client_log_level', 'DEBUG', group='ironic') + self.driver = ironic_driver.IronicDriver(None) self.driver.virtapi = fake.FakeVirtAPI() self.ctx = nova_context.get_admin_context() diff --git a/nova/virt/ironic/driver.py b/nova/virt/ironic/driver.py index 95a438112066..8c46192059df 100644 --- a/nova/virt/ironic/driver.py +++ b/nova/virt/ironic/driver.py @@ -22,6 +22,7 @@ bare metal resources. """ import base64 import gzip +import logging as py_logging import shutil import tempfile import time @@ -75,9 +76,11 @@ opts = [ cfg.StrOpt('admin_url', help='Keystone public API endpoint.'), cfg.StrOpt('client_log_level', + deprecated_for_removal=True, help='Log level override for ironicclient. Set this in ' 'order to override the global "default_log_levels", ' - '"verbose", and "debug" settings.'), + '"verbose", and "debug" settings. ' + 'DEPRECATED: use standard logging configuration.'), cfg.StrOpt('admin_tenant_name', help='Ironic keystone tenant name.'), cfg.IntOpt('api_max_retries', @@ -178,12 +181,10 @@ class IronicDriver(virt_driver.ComputeDriver): self.node_cache = {} self.node_cache_time = 0 - # TODO(mrda): Bug ID 1365230 Logging configurability needs - # to be addressed ironicclient_log_level = CONF.ironic.client_log_level if ironicclient_log_level: - level = logging.getLevelName(ironicclient_log_level) - logger = logging.getLogger('ironicclient') + level = py_logging.getLevelName(ironicclient_log_level) + logger = py_logging.getLogger('ironicclient') logger.setLevel(level) self.ironicclient = client_wrapper.IronicClientWrapper()