diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-03 07:18:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-03 07:18:28 +0000 |
| commit | 80fd454ef7e9f6b340af74a84c2a82e86bb5bf0e (patch) | |
| tree | fd64e3ec43fd263292f1d5df95a9f4e7dac16656 /ironic/conductor/task_manager.py | |
| parent | f5e43ce1d3c948207f5eba3310f5351925c9bc7a (diff) | |
| parent | 7f46a03fca14fa013915fa5d55d1c197617fe2c4 (diff) | |
| download | ironic-80fd454ef7e9f6b340af74a84c2a82e86bb5bf0e.tar.gz | |
Merge "Refactor driver loading to load a driver instance per node"
Diffstat (limited to 'ironic/conductor/task_manager.py')
| -rw-r--r-- | ironic/conductor/task_manager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ironic/conductor/task_manager.py b/ironic/conductor/task_manager.py index ad1f64e9f..a520816e3 100644 --- a/ironic/conductor/task_manager.py +++ b/ironic/conductor/task_manager.py @@ -211,8 +211,8 @@ class TaskManager(object): self.ports = objects.Port.list_by_node_id(context, self.node.id) self.portgroups = objects.Portgroup.list_by_node_id(context, self.node.id) - self.driver = driver_factory.get_driver(driver_name or - self.node.driver) + self.driver = driver_factory.build_driver_for_task( + self, driver_name=driver_name) # NOTE(deva): this handles the Juno-era NOSTATE state # and should be deleted after Kilo is released |