openstack/nova
Code Issues Proposed changes

Merge "config: remove deprecated ironic.client_log_level"

Browse Source
This commit is contained in:
Jenkins 2016-05-09 13:45:26 +00:00 committed by Gerrit Code Review
commit 41a84b59da
4 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nova/conf/ironic.py
View File

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

3
nova/tests/unit/virt/ironic/test_driver.py
View File

@ -96,9 +96,6 @@ class IronicDriverTestCase(test.NoDBTestCase):
super(IronicDriverTestCase, self).setUp() super(IronicDriverTestCase, self).setUp()
self.flags(**IRONIC_FLAGS) 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 = ironic_driver.IronicDriver(None)
self.driver.virtapi = fake.FakeVirtAPI() self.driver.virtapi = fake.FakeVirtAPI()
self.ctx = nova_context.get_admin_context() self.ctx = nova_context.get_admin_context()

7
nova/virt/ironic/driver.py
View File

@ -22,7 +22,6 @@ bare metal resources.
""" """
import base64 import base64
import gzip import gzip
import logging as py_logging
import shutil import shutil
import tempfile import tempfile
import time import time
@ -145,12 +144,6 @@ class IronicDriver(virt_driver.ComputeDriver):
self.node_cache = {} self.node_cache = {}
self.node_cache_time = 0 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() self.ironicclient = client_wrapper.IronicClientWrapper()
def _get_node(self, node_uuid): def _get_node(self, node_uuid):

6
releasenotes/notes/config-ironic-client_log_level-2bb84f12154417ca.yaml Normal file
View File

@ -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.