Remove deprecated nova_http_log_debug option

Change-Id: I6f005fdfcb8304f108969e84783c750ea34cfe9d
This commit is contained in:
Julien Danjou 2017-09-25 20:59:14 +01:00
parent 86440a25f7
commit d563e1348b
4 changed files with 5 additions and 21 deletions

View File

@ -22,15 +22,6 @@ from oslo_log import log
from ceilometer import keystone_client from ceilometer import keystone_client
OPTS = [
cfg.BoolOpt('nova_http_log_debug',
default=False,
# Added in Mitaka
deprecated_for_removal=True,
help=('Allow novaclient\'s debug log output. '
'(Use default_log_levels instead)')),
]
SERVICE_OPTS = [ SERVICE_OPTS = [
cfg.StrOpt('nova', cfg.StrOpt('nova',
default='compute', default='compute',
@ -60,10 +51,6 @@ class Client(object):
"""Initialize a nova client object.""" """Initialize a nova client object."""
creds = conf.service_credentials creds = conf.service_credentials
logger = None
if conf.nova_http_log_debug:
logger = log.getLogger("novaclient-debug")
logger.logger.setLevel(log.DEBUG)
ks_session = keystone_client.get_session(conf) ks_session = keystone_client.get_session(conf)
self.nova_client = nova_client.Client( self.nova_client = nova_client.Client(
@ -73,8 +60,7 @@ class Client(object):
# nova adapter options # nova adapter options
region_name=creds.region_name, region_name=creds.region_name,
endpoint_type=creds.interface, endpoint_type=creds.interface,
service_type=conf.service_types.nova, service_type=conf.service_types.nova)
logger=logger)
self.glance_client = glanceclient.Client( self.glance_client = glanceclient.Client(
version='2', version='2',

View File

@ -83,7 +83,6 @@ def list_opts():
ceilometer.compute.virt.libvirt.utils.OPTS, ceilometer.compute.virt.libvirt.utils.OPTS,
ceilometer.dispatcher.OPTS, ceilometer.dispatcher.OPTS,
ceilometer.ipmi.notifications.ironic.OPTS, ceilometer.ipmi.notifications.ironic.OPTS,
ceilometer.nova_client.OPTS,
ceilometer.objectstore.swift.OPTS, ceilometer.objectstore.swift.OPTS,
ceilometer.pipeline.OPTS, ceilometer.pipeline.OPTS,
ceilometer.sample.OPTS, ceilometer.sample.OPTS,

View File

@ -242,8 +242,3 @@ class TestNovaClient(base.BaseTestCase):
self.assertIsNone(instance.kernel_id) self.assertIsNone(instance.kernel_id)
self.assertIsNone(instance.image) self.assertIsNone(instance.image)
self.assertIsNone(instance.ramdisk_id) self.assertIsNone(instance.ramdisk_id)
def test_with_nova_http_log_debug(self):
self.CONF.set_override("nova_http_log_debug", True)
self.nv = nova_client.Client(self.CONF)
self.assertIsNotNone(self.nv.nova_client.client.logger)

View File

@ -0,0 +1,4 @@
---
upgrade:
- |
The deprecated `nova_http_log_debug` option has been removed.