diff --git a/ironic/cmd/api.py b/ironic/cmd/api.py index 2b7a0ebf9f..9cf373c944 100644 --- a/ironic/cmd/api.py +++ b/ironic/cmd/api.py @@ -25,8 +25,6 @@ from oslo_reports import guru_meditation_report as gmr from ironic.common import profiler from ironic.common import service as ironic_service from ironic.common import wsgi_service -from ironic.objects import base -from ironic.objects import indirection from ironic import version CONF = cfg.CONF @@ -38,10 +36,6 @@ def main(): gmr.TextGuruMeditation.setup_autorun(version) - # Enable object backporting via the conductor - base.IronicObject.indirection_api = ( - indirection.IronicObjectIndirectionAPI()) - profiler.setup('ironic_api', CONF.host) # Build and start the WSGI app diff --git a/ironic/tests/base.py b/ironic/tests/base.py index 7c553b8267..7482d762e2 100644 --- a/ironic/tests/base.py +++ b/ironic/tests/base.py @@ -89,7 +89,6 @@ class TestCase(oslo_test_base.BaseTestCase): # NOTE(danms): Make sure to reset us back to non-remote objects # for each test to avoid interactions. Also, backup the object # registry - objects_base.IronicObject.indirection_api = None self._base_test_obj_backup = copy.copy( objects_base.IronicObjectRegistry.obj_classes()) self.addCleanup(self._restore_obj_registry)