diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-29 22:58:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-29 22:58:31 +0000 |
| commit | 05958d176cd9438c2fd5028256260f9f9ae9ff20 (patch) | |
| tree | 17094890fc80f346e9257fdc4c69842c08ae36dd | |
| parent | 873830948c19012931a5b220f7e7f1089149b538 (diff) | |
| parent | 14f1536ff3d5591dd4aa10535ff1e4b01d95507e (diff) | |
| download | nova-05958d176cd9438c2fd5028256260f9f9ae9ff20.tar.gz nova-05958d176cd9438c2fd5028256260f9f9ae9ff20.tar.xz nova-05958d176cd9438c2fd5028256260f9f9ae9ff20.zip | |
Merge "Be consistent with disabling periodic tasks."
| -rw-r--r-- | nova/compute/manager.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/nova/compute/manager.py b/nova/compute/manager.py index 5aac65a54..af15f7e53 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 " @@ -2438,7 +2435,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: |