diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-10-24 21:51:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-10-24 21:51:10 +0000 |
| commit | 69e1015b6ea2e66ae45dfed4c90103939b73dfa5 (patch) | |
| tree | 2154027948321d5c959029ce25cd9ed9bb3bab2f /nova/compute | |
| parent | 1123c87e58bf0b128230a02ebe29f1f6d6b632c8 (diff) | |
| parent | cc4d766a0476211288d5b67f3647a721159185d3 (diff) | |
Merge "Remove database usage from libvirt imagecache module"
Diffstat (limited to 'nova/compute')
| -rw-r--r-- | nova/compute/manager.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 136a35ffb..6d19af6c7 100644 --- a/nova/compute/manager.py +++ b/nova/compute/manager.py @@ -2998,7 +2998,5 @@ class ComputeManager(manager.SchedulerDependentManager): if FLAGS.image_cache_manager_interval == 0: return - try: - self.driver.manage_image_cache(context) - except NotImplementedError: - pass + all_instances = self.db.instance_get_all(context) + self.driver.manage_image_cache(context, all_instances) |