diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2012-12-11 07:54:28 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2012-12-11 07:55:53 +0000 |
| commit | 473ef9e80d2c29e2d6f3fecca07f3720a0fe2ba4 (patch) | |
| tree | 6e63840c75693b968fd7348061b50ff914ab57a2 /nova/image | |
| parent | a317ea56b98036e88ecf9eb00b0d184924819c6e (diff) | |
| download | nova-473ef9e80d2c29e2d6f3fecca07f3720a0fe2ba4.tar.gz nova-473ef9e80d2c29e2d6f3fecca07f3720a0fe2ba4.tar.xz nova-473ef9e80d2c29e2d6f3fecca07f3720a0fe2ba4.zip | |
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/image')
| -rw-r--r-- | nova/image/glance.py | 18 |
1 files changed, 15 insertions, 3 deletions
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): |