From 473ef9e80d2c29e2d6f3fecca07f3720a0fe2ba4 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
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/image/glance.py | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'nova/image')

diff --git a/nova/image/glance.py b/nova/image/glance.py
index 7ccef6731..ce6fd530f 100644
--- a/nova/image/glance.py
+++ b/nova/image/glance.py
@@ -35,13 +35,25 @@ from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 
+glance_opts = [
+    cfg.ListOpt('glance_api_servers',
+                default=['$glance_host:$glance_port'],
+                help='A list of the glance api servers available to nova. '
+                     'Prefix with https:// for ssl-based glance api servers. '
+                     '([hostname|ip]:port)'),
+    cfg.BoolOpt('glance_api_insecure',
+                default=False,
+                help='Allow to perform insecure SSL (https) requests to '
+                     'glance'),
+    cfg.IntOpt('glance_num_retries',
+               default=0,
+               help='Number retries when downloading an image from glance'),
+]
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
+CONF.register_opts(glance_opts)
 CONF.import_opt('auth_strategy', 'nova.api.auth')
-CONF.import_opt('glance_api_insecure', 'nova.config')
-CONF.import_opt('glance_api_servers', 'nova.config')
-CONF.import_opt('glance_num_retries', 'nova.config')
 
 
 def _parse_image_ref(image_href):
-- 
cgit