Consolidate [image_cache] conf options

Blueprint image-precache-support added a conf section called
[image_cache], so it makes sense to move all the existing image
cache-related conf options into it.

Old:
[DEFAULT]image_cache_manager_interval
[DEFAULT]image_cache_subdirectory_name
[DEFAULT]remove_unused_base_images
[DEFAULT]remove_unused_original_minimum_age_seconds
[libvirt]remove_unused_resized_minimum_age_seconds

New:
[image_cache]manager_interval
[image_cache]subdirectory_name
[image_cache]remove_unused_base_images
[image_cache]remove_unused_original_minimum_age_seconds
[image_cache]remove_unused_resized_minimum_age_seconds

Change-Id: I3c49825ac0d70152b6c8ee4c8ca01546265f4b80
Partial-Bug: #1847302

1 files changed, 0 insertions, 41 deletions

diff --git a/nova/conf/compute.py b/nova/conf/compute.py
index 17f876ee8a..5da7d9f694 100644
--- a/nova/conf/compute.py
+++ b/nova/conf/compute.py
@@ -264,22 +264,6 @@ driver (for qcow and raw), or loop (for raw).
         default=10,
         min=0,
         help='Amount of time, in seconds, to wait for NBD device start up.'),
-    cfg.StrOpt('image_cache_subdirectory_name',
-        default='_base',
-        help="""
-Location of cached images.
-
-This is NOT the full path - just a folder name relative to '$instances_path'.
-For per-compute-host cached images, set to '_base_$my_ip'
-"""),
-    cfg.BoolOpt('remove_unused_base_images',
-        default=True,
-        help='Should unused base images be removed?'),
-    cfg.IntOpt('remove_unused_original_minimum_age_seconds',
-        default=(24 * 3600),
-        help="""
-Unused unresized base images younger than this will not be removed.
-"""),
     cfg.StrOpt('pointer_model',
         default='usbtablet',
         choices=[
@@ -954,31 +938,6 @@ Possible values:
 ]
 
 interval_opts = [
-    cfg.IntOpt('image_cache_manager_interval',
-        default=2400,
-        min=-1,
-        help="""
-Number of seconds to wait between runs of the image cache manager.
-
-Note that when using shared storage for the ``[DEFAULT]/instances_path``
-configuration option across multiple nova-compute services, this periodic
-could process a large number of instances. Similarly, using a compute driver
-that manages a cluster (like vmwareapi.VMwareVCDriver) could result in
-processing a large number of instances. Therefore you may need to adjust the
-time interval for the anticipated load, or only run on one nova-compute
-service within a shared storage aggregate.
-
-Possible values:
-
-* 0: run at the default interval of 60 seconds (not recommended)
-* -1: disable
-* Any other value
-
-Related options:
-
-* ``[DEFAULT]/compute_driver``
-* ``[DEFAULT]/instances_path``
-"""),
     cfg.IntOpt('bandwidth_poll_interval',
         default=600,
         help="""