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
This commit is contained in:
Mark McLoughlin 2012-12-11 07:54:28 +00:00
parent a317ea56b9
commit 473ef9e80d
3 changed files with 16 additions and 16 deletions
nova

@ -84,18 +84,6 @@ global_opts = [
default='http',
help='Default protocol to use when connecting to glance. '
'Set to https for SSL.'),
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'),
cfg.IntOpt('s3_port',
default=3333,
help='port used when accessing the s3 api'),

@ -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):

@ -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')