diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-12-12 02:44:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-12-12 02:44:02 +0000 |
| commit | edec1158f226228446bd4b29e7eed76d2b511c94 (patch) | |
| tree | aecad2d114bfe41b9b0aa92a06cc6d0ef6148277 | |
| parent | 1134dd17ed74066cd4938a2e8842382c7fbbd338 (diff) | |
| parent | a317ea56b98036e88ecf9eb00b0d184924819c6e (diff) | |
| download | nova-edec1158f226228446bd4b29e7eed76d2b511c94.tar.gz nova-edec1158f226228446bd4b29e7eed76d2b511c94.tar.xz nova-edec1158f226228446bd4b29e7eed76d2b511c94.zip | |
Merge "Move cache_images to nova.virt.xenapi.vm_utils"
| -rw-r--r-- | nova/config.py | 6 | ||||
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/nova/config.py b/nova/config.py index 8996400d0..28b98f360 100644 --- a/nova/config.py +++ b/nova/config.py @@ -249,12 +249,6 @@ global_opts = [ cfg.ListOpt('isolated_hosts', default=[], help='Host reserved for specific images'), - cfg.StrOpt('cache_images', - default='all', - help='Cache glance images locally. `all` will cache all' - ' images, `some` will only cache images that have the' - ' image_property `cache_in_nova=True`, and `none` turns' - ' off caching entirely'), cfg.BoolOpt('use_cow_images', default=True, help='Whether to use cow images'), diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index bf9687722..b1b4ed69f 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -52,6 +52,12 @@ from nova.virt.xenapi import volume_utils LOG = logging.getLogger(__name__) xenapi_vm_utils_opts = [ + cfg.StrOpt('cache_images', + default='all', + help='Cache glance images locally. `all` will cache all' + ' images, `some` will only cache images that have the' + ' image_property `cache_in_nova=True`, and `none` turns' + ' off caching entirely'), cfg.StrOpt('default_os_type', default='linux', help='Default OS type'), @@ -116,7 +122,6 @@ xenapi_vm_utils_opts = [ CONF = cfg.CONF CONF.register_opts(xenapi_vm_utils_opts) -CONF.import_opt('cache_images', 'nova.config') CONF.import_opt('default_ephemeral_format', 'nova.config') CONF.import_opt('glance_num_retries', 'nova.config') CONF.import_opt('use_cow_images', 'nova.config') |