From 14f1536ff3d5591dd4aa10535ff1e4b01d95507e Mon Sep 17 00:00:00 2001 From: Michael Still Date: Wed, 29 Feb 2012 11:11:57 +1100 Subject: 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 --- nova/compute/manager.py | 5 +---- 1 file changed, 1 insertion(+), 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: -- cgit