diff options
| -rw-r--r-- | nova/config.py | 12 | ||||
| -rw-r--r-- | nova/image/glance.py | 18 | ||||
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 2 |
3 files changed, 16 insertions, 16 deletions
diff --git a/nova/config.py b/nova/config.py index 28b98f360..ba7897305 100644 --- a/nova/config.py +++ b/nova/config.py @@ -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'), 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): 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') |