From 34823e35c848e5cff4a6eef423fd02304f6430f0 Mon Sep 17 00:00:00 2001 From: Devananda van der Veen Date: Wed, 10 Jul 2013 08:54:41 -0700 Subject: [PATCH] Update resource manager for fixed stevedore issue Stevedore commit 69e17801a3f0cf37257069da7dc83e2608f31aa5 fixed a known issue in conductor.resource_manager. This patch updates the Ironic code to use stevedore's new accessor. Change-Id: I0f57831a70368afb5ea321c0e607f762d464c2a0 --- ironic/conductor/resource_manager.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/ironic/conductor/resource_manager.py b/ironic/conductor/resource_manager.py index 65472d58b7..2806dd772a 100644 --- a/ironic/conductor/resource_manager.py +++ b/ironic/conductor/resource_manager.py @@ -59,19 +59,12 @@ class NodeManager(object): self.node = db.get_node(id) self.ports = db.get_ports_by_node(id) - def _get_instance(ext, *args, **kwds): - return ext.obj - - # NOTE(deva): Driver loading here may get refactored, depend on: - # https://github.com/dreamhost/stevedore/issues/15 + driver_name = self.node.get('driver') try: - ref = NodeManager._driver_factory.map( - [self.node.get('driver')], _get_instance) - self.driver = ref[0] + self.driver = NodeManager._driver_factory[driver_name].obj except KeyError: raise exception.IronicException(_( - "Failed to load driver %s.") % - self.node.get('driver')) + "Failed to load driver %s.") % driver_name) @classmethod @lockutils.synchronized(RESOURCE_MANAGER_SEMAPHORE, 'ironic-')