diff --git a/oslo/messaging/_drivers/common.py b/oslo/messaging/_drivers/common.py index be04572a7..af02effd7 100644 --- a/oslo/messaging/_drivers/common.py +++ b/oslo/messaging/_drivers/common.py @@ -20,7 +20,6 @@ import logging import sys import traceback -from oslo.config import cfg from oslo import messaging import six @@ -73,18 +72,6 @@ _MESSAGE_KEY = 'oslo.message' _REMOTE_POSTFIX = '_Remote' -_exception_opts = [ - cfg.ListOpt('allowed_rpc_exception_modules', - default=['oslo.messaging.exceptions', - 'nova.exception', - 'cinder.exception', - _EXCEPTIONS_MODULE, - ], - help='Modules of exceptions that are permitted to be ' - 'recreated upon receiving exception data from an rpc ' - 'call.'), -] - class RPCException(Exception): msg_fmt = _("An unknown RPC related exception occurred.") diff --git a/oslo/messaging/opts.py b/oslo/messaging/opts.py index 9266bebb3..065885825 100644 --- a/oslo/messaging/opts.py +++ b/oslo/messaging/opts.py @@ -21,7 +21,6 @@ import copy import itertools from oslo.messaging._drivers import amqp -from oslo.messaging._drivers import common as drivers_common from oslo.messaging._drivers import impl_qpid from oslo.messaging._drivers import impl_rabbit from oslo.messaging._drivers import impl_zmq @@ -35,7 +34,6 @@ from oslo.messaging import transport _global_opt_lists = [ amqp.amqp_opts, - drivers_common._exception_opts, impl_qpid.qpid_opts, impl_rabbit.rabbit_opts, impl_zmq.zmq_opts, diff --git a/tests/test_opts.py b/tests/test_opts.py index 2709a5a94..6b71ceb68 100644 --- a/tests/test_opts.py +++ b/tests/test_opts.py @@ -30,7 +30,6 @@ class OptsTestCase(test_utils.BaseTestCase): opt_names = [o.name for (g, l) in result for o in l] self.assertIn('rpc_backend', opt_names) - self.assertIn('allowed_rpc_exception_modules', opt_names) def test_list_opts(self): self._test_list_opts(opts.list_opts())