summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Still <mikal@stillhq.com>2012-02-29 11:11:57 +1100
committerMichael Still <mikal@stillhq.com>2012-02-29 14:35:30 +1100
commit14f1536ff3d5591dd4aa10535ff1e4b01d95507e (patch)
tree91e092693d72ac5f34b6350691491b306a425c4d
parent2fa6e23e9cefb8e45bd5a6cec36b1ac6b7ac65c3 (diff)
downloadnova-14f1536ff3d5591dd4aa10535ff1e4b01d95507e.tar.gz
nova-14f1536ff3d5591dd4aa10535ff1e4b01d95507e.tar.xz
nova-14f1536ff3d5591dd4aa10535ff1e4b01d95507e.zip
Be consistent with disabling periodic tasks.
Other periodic tasks use an interval of zero to signal that they are disabled. Use that for the libvirt image cache manager as well. Change-Id: I12fddd52fe587d3975004c696c65dae5427498fa
-rw-r--r--nova/compute/manager.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 2221946af..d60f5d606 100644
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -111,9 +111,6 @@ compute_opts = [
help="Action to take if a running deleted instance is detected."
"Valid options are 'noop', 'log' and 'reap'. "
"Set to 'noop' to disable."),
- cfg.BoolOpt("use_image_cache_manager",
- default=False,
- help="Whether to manage images in the local cache."),
cfg.IntOpt("image_cache_manager_interval",
default=3600,
help="Number of periodic scheduler ticks to wait between "
@@ -2436,7 +2433,7 @@ class ComputeManager(manager.SchedulerDependentManager):
def _run_image_cache_manager_pass(self, context):
"""Run a single pass of the image cache manager."""
- if not FLAGS.use_image_cache_manager:
+ if FLAGS.image_cache_manager_interval == 0:
return
try: