diff options
| author | Zuul <zuul@review.openstack.org> | 2017-11-14 07:17:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-11-14 07:17:54 +0000 |
| commit | 04015a0b51852884b1d86921ec5ec40f8ec99e32 (patch) | |
| tree | 80d1243f6199f5ecea9d7bd1158662396087eea3 | |
| parent | d38328d1fe4a43ff3e28d5602968a31fdc1d7854 (diff) | |
| parent | 7b09d3e8dc3306d59940e7d8c92321fa2b2eb273 (diff) | |
| download | ironic-04015a0b51852884b1d86921ec5ec40f8ec99e32.tar.gz | |
Merge "Remove unused IronicObjectIndirectionAPI from ironic-api"
| -rw-r--r-- | ironic/cmd/api.py | 6 | ||||
| -rw-r--r-- | ironic/tests/base.py | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/ironic/cmd/api.py b/ironic/cmd/api.py index 2b7a0ebf9..9cf373c94 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 7c553b826..7482d762e 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) |