openstack/nova
Code Issues Proposed changes

Make sure options is set before checking managed_disk setting. Fixes bug 860520.

Browse Source 
Change-Id: I83c6c1cdb8e11959d6af5c08827e9f9ce82a5913
This commit is contained in:
Dan Prince
2011-09-27 08:58:54 -04:00
parent a51533729a
commit 21da183ede
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/xenserver/xenapi/etc/xapi.d/plugins/glance
View File

@@ -293,7 +293,7 @@ def _upload_tarball(staging_path, image_id, glance_host, glance_port, os_type,
'x-image-meta-container-format': 'ovf', 'x-image-meta-container-format': 'ovf',
'x-image-meta-property-os-type': os_type} 'x-image-meta-property-os-type': os_type}
if options.get('managed_disk'): if options and options.get('managed_disk'):
headers['x-image-meta-property-managed-disk'] = options['managed_disk'] headers['x-image-meta-property-managed-disk'] = options['managed_disk']
# If we have an auth_token, set an x-auth-token header # If we have an auth_token, set an x-auth-token header