diff options
| author | Vincent Untz <vuntz@suse.com> | 2012-08-22 15:40:59 +0200 |
|---|---|---|
| committer | Vincent Untz <vuntz@suse.com> | 2012-08-27 08:48:18 +0200 |
| commit | fa5be443bae880ab15d5079caa28d6862cbd13b9 (patch) | |
| tree | c40e4f638deaec2b2215ec95560579593e4c3180 /nova/virt | |
| parent | 68e9a9e351e5b7bc91148a939d470ba04a525020 (diff) | |
Allow connecting to a ssl-based glance
This introduces a new glance_api_insecure setting that can be used to
not verify the certificate of the glance server against the certificate
authorities.
Fix bug 1042081.
Change-Id: I0a9f081425854e9c01e00dfd641e42276c878c67
Diffstat (limited to 'nova/virt')
| -rw-r--r-- | nova/virt/xenapi/vm_utils.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py index 744770528..97650b248 100644 --- a/nova/virt/xenapi/vm_utils.py +++ b/nova/virt/xenapi/vm_utils.py @@ -649,7 +649,7 @@ def upload_image(context, session, instance, vdi_uuids, image_id): " ID %(image_id)s"), locals(), instance=instance) glance_api_servers = glance.get_api_servers() - glance_host, glance_port = glance_api_servers.next() + glance_host, glance_port, glance_use_ssl = glance_api_servers.next() # TODO(sirp): this inherit-image-property code should probably go in # nova/compute/manager so it can be shared across hypervisors @@ -669,6 +669,7 @@ def upload_image(context, session, instance, vdi_uuids, image_id): 'image_id': image_id, 'glance_host': glance_host, 'glance_port': glance_port, + 'glance_use_ssl': glance_use_ssl, 'sr_path': get_sr_path(session), 'auth_token': getattr(context, 'auth_token', None), 'properties': properties} @@ -1011,9 +1012,10 @@ def _fetch_vhd_image(context, session, instance, image_id): glance_api_servers = glance.get_api_servers() def pick_glance(params): - glance_host, glance_port = glance_api_servers.next() + glance_host, glance_port, glance_use_ssl = glance_api_servers.next() params['glance_host'] = glance_host params['glance_port'] = glance_port + params['glance_use_ssl'] = glance_use_ssl plugin_name = 'glance' vdis = _fetch_using_dom0_plugin_with_retry( |