summaryrefslogtreecommitdiffstats
path: root/nova/virt
diff options
context:
space:
mode:
authorMark McLoughlin <markmc@redhat.com>2012-12-11 07:54:28 +0000
committerMark McLoughlin <markmc@redhat.com>2012-12-11 07:55:53 +0000
commit473ef9e80d2c29e2d6f3fecca07f3720a0fe2ba4 (patch)
tree6e63840c75693b968fd7348061b50ff914ab57a2 /nova/virt
parenta317ea56b98036e88ecf9eb00b0d184924819c6e (diff)
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
Diffstat (limited to 'nova/virt')
-rw-r--r--nova/virt/xenapi/vm_utils.py2
1 files changed, 1 insertions, 1 deletions
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')