diff --git a/doc/source/admin/report.txt b/doc/source/admin/report.txt index 1293047f7a..c3cfdbf3e4 100644 --- a/doc/source/admin/report.txt +++ b/doc/source/admin/report.txt @@ -273,7 +273,6 @@ default: no-raid enabled_vendor_interfaces = no-vendor - fatal_exception_format_errors = False force_raw_images = True graceful_shutdown_timeout = 60 grub_config_template = /opt/stack/ironic/ironic/common/grub_conf.template diff --git a/ironic/conf/default.py b/ironic/conf/default.py index 9621c2db56..20a06846b7 100644 --- a/ironic/conf/default.py +++ b/ironic/conf/default.py @@ -152,18 +152,9 @@ driver_opts = [ ] exc_log_opts = [ - cfg.BoolOpt('fatal_exception_format_errors', - default=False, - help=_('Used if there is a formatting error when generating ' - 'an exception message (a programming error). If True, ' - 'raise an exception; if False, use the unformatted ' - 'message.'), - deprecated_for_removal=True, - deprecated_reason=_('Same option in the ironic_lib section ' - 'should be used instead.')), cfg.IntOpt('log_in_db_max_size', default=4096, help=_('Max number of characters of any node ' - 'last_error/maintenance_reason pushed to database.')), + 'last_error/maintenance_reason pushed to database.')) ] hash_opts = [ diff --git a/ironic/tests/base.py b/ironic/tests/base.py index e7537efbdd..957fc88cc5 100644 --- a/ironic/tests/base.py +++ b/ironic/tests/base.py @@ -120,7 +120,6 @@ class TestCase(oslo_test_base.BaseTestCase): def _set_config(self): self.cfg_fixture = self.useFixture(config_fixture.Config(CONF)) self.config(use_stderr=False, - fatal_exception_format_errors=True, tempdir=tempfile.tempdir) self.config(cleaning_network=uuidutils.generate_uuid(), group='neutron') diff --git a/releasenotes/notes/del-fatal_exception_format_errors-f63b15c8aa460dff.yaml b/releasenotes/notes/del-fatal_exception_format_errors-f63b15c8aa460dff.yaml new file mode 100644 index 0000000000..54f2dd31af --- /dev/null +++ b/releasenotes/notes/del-fatal_exception_format_errors-f63b15c8aa460dff.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The ``[DEFAULT]fatal_exception_format_errors`` was removed, + use ``[ironic_lib]fatal_exception_format_errors`` instead.