Merge "Add virt driver capabilities definition"

openstack · Oct 24, 2012 · a3d27d1 · a3d27d1
2 parents 7c36755 + 0daebe7
commit a3d27d1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
@@ -2970,6 +2970,8 @@ def remove_aggregate_host(self, context, aggregate_id,
     def _run_image_cache_manager_pass(self, context):
         """Run a single pass of the image cache manager."""
 
+        if not self.driver.capabilities["has_imagecache"]:
+            return
         if FLAGS.image_cache_manager_interval == 0:
             return
 

diff --git a/nova/virt/driver.py b/nova/virt/driver.py
@@ -88,6 +88,10 @@ class ComputeDriver(object):
 
     """
 
+    capabilities = {
+        "has_imagecache": False,
+        }
+
     def init_host(self, host):
         """Initialize anything that is necessary for the driver to function,
         including catching up with currently running VM's on the given host."""

diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
@@ -258,6 +258,10 @@ def _get_eph_disk(ephemeral):
 
 class LibvirtDriver(driver.ComputeDriver):
 
+    capabilities = {
+        "has_imagecache": True,
+        }
+
     def __init__(self, read_only=False):
         super(LibvirtDriver, self).__init__()