From 473ef9e80d2c29e2d6f3fecca07f3720a0fe2ba4 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 11 Dec 2012 07:54:28 +0000 Subject: Move some options into nova.image.glance The glance_api_servers and glance_api_insecure options are only used in nova.image.glance. The only other place that glance_num_retries is used is nova.virt.xenapi.vm_utils. blueprint: scope-config-opts Change-Id: I2cd0f62e43379bc94c95f85ab5b4aac9faf6c4f7 --- nova/virt/xenapi/vm_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nova/virt') diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index b1b4ed69f..be1a0f4ef 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -123,7 +123,7 @@ xenapi_vm_utils_opts = [ CONF = cfg.CONF CONF.register_opts(xenapi_vm_utils_opts) CONF.import_opt('default_ephemeral_format', 'nova.config') -CONF.import_opt('glance_num_retries', 'nova.config') +CONF.import_opt('glance_num_retries', 'nova.image.glance') CONF.import_opt('use_cow_images', 'nova.config') CONF.import_opt('use_ipv6', 'nova.config') -- cgit