Merge "config: remove deprecated ironic.client_log_level"

nova/conf/ironic.py

@@ -56,14 +56,6 @@ cafile = cfg.StrOpt(
     help='PEM encoded Certificate Authority to use when verifying HTTPs '
          'connections.')
 
-client_log_level = 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. '
-         'DEPRECATED: use standard logging configuration.')
-
 admin_tenant_name = cfg.StrOpt(
     'admin_tenant_name',
     help='Ironic keystone tenant name.')
@@ -87,7 +79,6 @@ ALL_OPTS = [api_version,
             admin_auth_token,
             admin_url,
             cafile,
-            client_log_level,
             admin_tenant_name,
             api_max_retries,
             api_retry_interval]

nova/tests/unit/virt/ironic/test_driver.py

@@ -96,9 +96,6 @@ 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()

nova/virt/ironic/driver.py

@@ -22,7 +22,6 @@ bare metal resources.
 """
 import base64
 import gzip
-import logging as py_logging
 import shutil
 import tempfile
 import time
@@ -145,12 +144,6 @@ class IronicDriver(virt_driver.ComputeDriver):
         self.node_cache = {}
         self.node_cache_time = 0
 
-        ironicclient_log_level = CONF.ironic.client_log_level
-        if ironicclient_log_level:
-            level = py_logging.getLevelName(ironicclient_log_level)
-            logger = py_logging.getLogger('ironicclient')
-            logger.setLevel(level)
-
         self.ironicclient = client_wrapper.IronicClientWrapper()
 
     def _get_node(self, node_uuid):

releasenotes/notes/config-ironic-client_log_level-2bb84f12154417ca.yaml

@@ -0,0 +1,6 @@
+---
+upgrade:
+  - The deprecated configuration option ``client_log_level`` of the section
+    ``[ironic]`` has been deleted. Please use the config options
+    ``log_config_append`` or ``default_log_levels`` of the ``[DEFAULT]``
+    section.