From 948f90835b816336b9df5d192445b74096bc1c50 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Wed, 14 Feb 2018 15:41:04 -0600 Subject: [PATCH] Remove deprecated fatal_exception_format_errors option This config option was only used for internal testing. In Queens tests were updated to always do this, regardless of the config option. This removes the option. No release note included since this was really only an internal thing and mentioning there would probably just cause confusion. Change-Id: Ib3cde34d9a181107c77c31c22d225dab073f37b0 --- cinder/exception.py | 14 -------------- cinder/opts.py | 2 -- 2 files changed, 16 deletions(-) diff --git a/cinder/exception.py b/cinder/exception.py index fd5aba1823b..fb48ebd6e79 100644 --- a/cinder/exception.py +++ b/cinder/exception.py @@ -22,7 +22,6 @@ SHOULD include dedicated exception logging. """ -from oslo_config import cfg from oslo_log import log as logging from oslo_versionedobjects import exception as obj_exc import six @@ -35,19 +34,6 @@ from cinder.i18n import _ LOG = logging.getLogger(__name__) -# TODO(smcginnis) Remove in Rocky -exc_log_opts = [ - cfg.BoolOpt('fatal_exception_format_errors', - default=False, - help='Make exception message format errors fatal.', - deprecated_for_removal=True, - deprecated_since='12.0.0', - deprecated_reason='This is only used for internal testing.'), -] - -CONF = cfg.CONF -CONF.register_opts(exc_log_opts) - class ConvertedException(webob.exc.WSGIHTTPException): def __init__(self, code=500, title="", explanation=""): diff --git a/cinder/opts.py b/cinder/opts.py index 4a5e0685de2..8c1d5c8f5ed 100644 --- a/cinder/opts.py +++ b/cinder/opts.py @@ -50,7 +50,6 @@ from cinder import context as cinder_context from cinder import coordination as cinder_coordination from cinder.db import api as cinder_db_api from cinder.db import base as cinder_db_base -from cinder import exception as cinder_exception from cinder.image import glance as cinder_image_glance from cinder.image import image_utils as cinder_image_imageutils from cinder.keymgr import conf_key_mgr as cinder_keymgr_confkeymgr @@ -229,7 +228,6 @@ def list_opts(): cinder_context.context_opts, cinder_db_api.db_opts, [cinder_db_base.db_driver_opt], - cinder_exception.exc_log_opts, cinder_image_glance.glance_opts, cinder_image_glance.glance_core_properties_opts, cinder_image_imageutils.image_helper_opts,