diff --git a/ceilometer/nova_client.py b/ceilometer/nova_client.py index 4b258c0a99..8334aaedfe 100644 --- a/ceilometer/nova_client.py +++ b/ceilometer/nova_client.py @@ -22,15 +22,6 @@ from oslo_log import log 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 = [ cfg.StrOpt('nova', default='compute', @@ -60,10 +51,6 @@ class Client(object): """Initialize a nova client object.""" 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) self.nova_client = nova_client.Client( @@ -73,8 +60,7 @@ class Client(object): # nova adapter options region_name=creds.region_name, endpoint_type=creds.interface, - service_type=conf.service_types.nova, - logger=logger) + service_type=conf.service_types.nova) self.glance_client = glanceclient.Client( version='2', diff --git a/ceilometer/opts.py b/ceilometer/opts.py index 9a09dfbf79..e2ba371ef2 100644 --- a/ceilometer/opts.py +++ b/ceilometer/opts.py @@ -83,7 +83,6 @@ def list_opts(): ceilometer.compute.virt.libvirt.utils.OPTS, ceilometer.dispatcher.OPTS, ceilometer.ipmi.notifications.ironic.OPTS, - ceilometer.nova_client.OPTS, ceilometer.objectstore.swift.OPTS, ceilometer.pipeline.OPTS, ceilometer.sample.OPTS, diff --git a/ceilometer/tests/unit/test_novaclient.py b/ceilometer/tests/unit/test_novaclient.py index 092d1392eb..8d6a0139ad 100644 --- a/ceilometer/tests/unit/test_novaclient.py +++ b/ceilometer/tests/unit/test_novaclient.py @@ -242,8 +242,3 @@ class TestNovaClient(base.BaseTestCase): self.assertIsNone(instance.kernel_id) self.assertIsNone(instance.image) 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) diff --git a/releasenotes/notes/remove-nova-http-log-option-64e97a511e58da5d.yaml b/releasenotes/notes/remove-nova-http-log-option-64e97a511e58da5d.yaml new file mode 100644 index 0000000000..579c290c8f --- /dev/null +++ b/releasenotes/notes/remove-nova-http-log-option-64e97a511e58da5d.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - | + The deprecated `nova_http_log_debug` option has been removed.